Changeset 171 in Sophya for trunk/SophyaPI/PIext/servnobjm.cc

Timestamp:

Dec 21, 1998, 9:49:55 AM (27 years ago)

Author:

ercodmgr

Message:

Adaptation a PDynLinkMgr Reza 21/12/98

File:

• trunk/SophyaPI/PIext/servnobjm.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/servnobjm.cc

@@ -2 +2 @@
 #include <stdlib.h>
 #include <ctype.h>
-
-#include <dlfcn.h>
 
 #include <iostream.h>
@@ -44 +42 @@
 {
 TmpDir = tmpdir;
+PDynLinkMgr::SetTmpDir(tmpdir);
 mImgapp = app;
-dlhandle = NULL;
+dynlink = NULL;
 InitGrAttNames();
 }
@@ -339 +338 @@
 string fnameobj = fnamer + ".o" ;
 string fnameso = fnamer + ".so";
-string cmd;
-int rc;
-
-
-// Compilation du fichier
-cmd = "cc -c -o " + fnameobj + " " + fname;
-rc = system(cmd.c_str());
-
-if (rc != 0)  { 
-  printf("LinkFunctionFromFile_Do> %s  (Rc=%d)\n", cmd.c_str(), rc); 
-  return(NULL);
-  }
-#if defined(OSF1) 
-  cmd = "ld -shared -o " + fnameso + " -all " + fnameobj + " -none -lm -lc";
-#else
-  cmd = "ld -shared -o " + fnameso + " " + fnameobj + " -lm -lc";
-#endif
-rc = system(cmd.c_str());
-if (rc != 0 ) { 
-  printf("LinkFunctionFromFile_Do> %s  (Rc=%d)\n", cmd.c_str(), rc); 
-  return(NULL);
-  }
 
 //  Le link dynamique
 CloseDLL();
-dlhandle =  dlopen(fnameso.c_str(), RTLD_NOW);
-if (dlhandle == NULL) { 
-  string sn = fnameso; 
-  cerr << "NamedObjMgr/FunctionFromFile_Erreur: Erreur ouverture SO " << sn << endl; 
-  sn = dlerror();
-  cerr << "Loader Error (dlerror()) :" << sn;
+dynlink = PDynLinkMgr::BuildFromCFile(fname);
+if (dynlink == NULL) { 
+  cerr << "NamedObjMgr/LinkFunctionFromFile_Erreur: Erreur ouverture SO " << endl; 
   return(NULL); 
   }
 
-DlFunction retfunc = (DlFunction) dlsym(dlhandle, funcname);
+DlFunction retfunc = dynlink->GetFunction(funcname);
 if (retfunc == NULL) { 
   string sn = funcname; 
@@ -386 +360 @@
 void Services2NObjMgr::CloseDLL()
 {
-if (dlhandle) dlclose(dlhandle);    dlhandle = NULL;
+if (dynlink) delete dynlink;   dynlink = NULL;
 }