compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17836

Modified Files:
	Benchmark-DLLoader.cpp 
Log Message:
UO_verbose_dl introduced.

Index: Benchmark-DLLoader.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-DLLoader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-DLLoader.cpp	22 Jan 2007 18:21:47 -0000	1.1
--- Benchmark-DLLoader.cpp	26 Jan 2007 01:47:45 -0000	1.2
***************
*** 35,44 ****
    cbmlib_internal *r;
  
!   if (UO_verbose)
      std::cout << "Loading " << lib << "... ";
  
    r=cbmlib_check_previousload(package_id);
    if (r) {
!     if (UO_verbose)
        std::cout << "found (cached)." << std::endl;
      return(r);
--- 35,44 ----
    cbmlib_internal *r;
  
!   if (UO_verbose_dl)
      std::cout << "Loading " << lib << "... ";
  
    r=cbmlib_check_previousload(package_id);
    if (r) {
!     if (UO_verbose_dl)
        std::cout << "found (cached)." << std::endl;
      return(r);
***************
*** 47,65 ****
    library=dlopen(lib, RTLD_NOW);
    if (library) {
!     if (UO_verbose)
        std::cout << "found." << std::endl;
      r=new cbmlib_internal;
      r->library=library;
!     if (UO_verbose)
        std::cout << " Checking cbmlib_getPackage... ";
      r->PackageGet=(cbmlib_internal_getPackage_t) (dlsym(r->library, "cbmlib_getPackage"));
      if (!r->PackageGet) {
        dlclose(library);
!       if (UO_verbose)
  	std::cout << "Invalid" << std::endl;
        delete(r);
        return(0);
      } else {
!       if (UO_verbose)
  	std::cout << "found." << std::endl;
      }
--- 47,65 ----
    library=dlopen(lib, RTLD_NOW);
    if (library) {
!     if (UO_verbose_dl)
        std::cout << "found." << std::endl;
      r=new cbmlib_internal;
      r->library=library;
!     if (UO_verbose_dl)
        std::cout << " Checking cbmlib_getPackage... ";
      r->PackageGet=(cbmlib_internal_getPackage_t) (dlsym(r->library, "cbmlib_getPackage"));
      if (!r->PackageGet) {
        dlclose(library);
!       if (UO_verbose_dl)
  	std::cout << "Invalid" << std::endl;
        delete(r);
        return(0);
      } else {
!       if (UO_verbose_dl)
  	std::cout << "found." << std::endl;
      }
***************
*** 68,72 ****
      return(r);
    } else {
!     if (UO_verbose)
        std::cout << "N.A. (" << dlerror() << ")" << std::endl;
    }
--- 68,72 ----
      return(r);
    } else {
!     if (UO_verbose_dl)
        std::cout << "N.A. (" << dlerror() << ")" << std::endl;
    }