(file) Return to SystemUnix.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/SystemUnix.cpp between version 1.113 and 1.114

version 1.113, 2005/11/21 10:03:05 version 1.114, 2005/12/09 20:45:45
Line 45 
Line 45 
  
 #ifdef PEGASUS_OS_HPUX #ifdef PEGASUS_OS_HPUX
 # include <dl.h> # include <dl.h>
   # include <dlfcn.h>
 #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
 # include <dll.h> # include <dll.h>
 #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM) #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)
Line 428 
Line 429 
     Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL2,     Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                   "Attempting to load library %s", fileName);                   "Attempting to load library %s", fileName);
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_TRU64)
     void* handle;  
     if (bindVerbose)  
     {  
         handle = shl_load(fileName,  
             BIND_IMMEDIATE | DYNAMIC_PATH | BIND_VERBOSE, 0L);  
     }  
     else  
     {  
         handle = shl_load(fileName, BIND_IMMEDIATE | DYNAMIC_PATH, 0L);  
     }  
     Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL2,  
                   "After loading lib %s, error code is %d", fileName,  
                   (handle == (void *)0)?errno:0);  
   
     PEG_METHOD_EXIT();  
     return DynamicLibraryHandle(handle);  
 #elif defined(PEGASUS_OS_TRU64)  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return DynamicLibraryHandle(dlopen(fileName, RTLD_NOW));     return DynamicLibraryHandle(dlopen(fileName, RTLD_NOW));
 #elif defined(PEGASUS_OS_ZOS) #elif defined(PEGASUS_OS_ZOS)
Line 470 
Line 454 
  
 void System::unloadDynamicLibrary(DynamicLibraryHandle libraryHandle) void System::unloadDynamicLibrary(DynamicLibraryHandle libraryHandle)
 { {
     // ATTN: Should this method indicate success/failure?  
 #if defined(PEGASUS_OS_LINUX) || defined(PEGASUS_OS_SOLARIS) || defined(PEGASUS_OS_DARWIN)  
     dlclose(libraryHandle);  
 #endif  
   
 #ifdef PEGASUS_OS_HPUX  
     // Note: shl_unload will unload the library even if it has been loaded  
     // multiple times.  No reference count is kept.  
     int ignored = shl_unload(reinterpret_cast<shl_t>(libraryHandle));  
 #endif  
   
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
    OS400_UnloadDynamicLibrary((int)libraryHandle);    OS400_UnloadDynamicLibrary((int)libraryHandle);
 #endif  #elif defined(PEGASUS_OS_ZOS)
   
 #ifdef PEGASUS_OS_AIX  
     dlclose(libraryHandle);  
 #endif  
   
 #ifdef PEGASUS_OS_ZOS  
     dllfree(reinterpret_cast<dllhandle *> (libraryHandle));     dllfree(reinterpret_cast<dllhandle *> (libraryHandle));
   #else
       dlclose(libraryHandle);
 #endif #endif
 } }
  
 String System::dynamicLoadError() { String System::dynamicLoadError() {
     // ATTN: Is this safe in a multi-threaded process?  Should this string     // ATTN: Is this safe in a multi-threaded process?  Should this string
     // be returned from loadDynamicLibrary?     // be returned from loadDynamicLibrary?
 #ifdef PEGASUS_OS_HPUX  #ifdef PEGASUS_OS_ZOS
     // If shl_load() returns NULL, errno is set to indicate the error  
     return strerror(errno);  
 #elif defined(PEGASUS_OS_ZOS)  
     return String();     return String();
 #elif defined(PEGASUS_OS_OS400) #elif defined(PEGASUS_OS_OS400)
     return String(OS400_DynamicLoadError());     return String(OS400_DynamicLoadError());
Line 515 
Line 481 
     DynamicLibraryHandle libraryHandle,     DynamicLibraryHandle libraryHandle,
     const char* symbolName)     const char* symbolName)
 { {
 #ifdef PEGASUS_OS_HPUX  
     char* p = (char*)symbolName;  
     void* proc = 0;  
  
     if (shl_findsym((shl_t*)&libraryHandle, symbolName, TYPE_UNDEFINED,  #ifdef PEGASUS_OS_ZOS
                     &proc) == 0)  
     {  
         return DynamicSymbolHandle(proc);  
     }  
   
     if (shl_findsym((shl_t*)libraryHandle,  
                     (String("_") + symbolName).getCString(),  
                     TYPE_UNDEFINED,  
                     &proc) == 0)  
     {  
         return DynamicSymbolHandle(proc);  
     }  
   
     return 0;  
   
 #elif defined(PEGASUS_OS_ZOS)  
     return DynamicSymbolHandle(dllqueryfn((dllhandle *)libraryHandle,     return DynamicSymbolHandle(dllqueryfn((dllhandle *)libraryHandle,
                                (char*)symbolName));                                (char*)symbolName));
  

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.114
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2