Changeset 1380:3d4feefdfb45

Timestamp:

10/17/09 01:10:13 (2 years ago)

Author:

niam

Branch:

default

Message:

call deinit module function in methods that get module information

Location:

trunk

Files:

• include/libdodo/xexec.h (modified) (2 diffs)
• src/exceptionBasic.cc (modified) (1 diff)
• src/xexec.cc (modified) (7 diffs)

trunk/include/libdodo/xexec.h

@@ -66 +66 @@
                 /**
                  * @struct __module__
-                 * @brief is returned from moduleInit in the library
+                 * @brief is returned from initModule in the library
                  */
                 struct __module__ {
@@ -76 +76 @@
 
                 /**
-                 * @typedef moduleInit
+                 * @typedef initModule
                  * @brief defines type of init function for library
                  * @param data defines user data
                  * @note name in the library must be initXexecModule
                  */
-                typedef __module__ (*moduleInit)(void *data);
-
-                /**
-                 * @typedef moduleDeinit
+                typedef __module__ (*initModule)(void *data);
+
+                /**
+                 * @typedef deinitModule
                  * @brief defines type of deinit function for library
                  * @note name in the library must be deinitXexecModule
                  */
-                typedef void (*moduleDeinit)();
+                typedef void (*deinitModule)();
 #endif
 

trunk/src/exceptionBasic.cc

@@ -1068 +1068 @@
         __module__ mod = init(toInit);
 
+        deinitModule deinit = (deinitModule)dlsym(handle, "deinitExceptionBasicModule");
+        if (deinit != NULL)
+                deinit();
+
 #ifndef DL_FAST
         if (dlclose(handle) != 0)

trunk/src/xexec.cc

@@ -74 +74 @@
 {
 #ifdef DL_EXT
-        moduleDeinit deinit;
+        deinitModule deinit;
 
         dodoList<__item__>::iterator i(preExec.begin()), j(preExec.end());
@@ -81 +81 @@
                         continue;
 
-                deinit = (moduleDeinit)dlsym(i->handle, "deinitXexecModule");
+                deinit = (deinitModule)dlsym(i->handle, "deinitXexecModule");
                 if (deinit != NULL)
                         deinit();
@@ -96 +96 @@
                         continue;
 
-                deinit = (moduleDeinit)dlsym(i->handle, "deinitXexecModule");
+                deinit = (deinitModule)dlsym(i->handle, "deinitXexecModule");
                 if (deinit != NULL)
                         deinit();
@@ -143 +143 @@
 #ifdef DL_EXT
         if (current->handle != NULL) {
-                moduleDeinit deinit;
-
-                deinit = (moduleDeinit)dlsym(current->handle, "deinitXexecModule");
+                deinitModule deinit;
+
+                deinit = (deinitModule)dlsym(current->handle, "deinitXexecModule");
                 if (deinit != NULL)
                         deinit();
@@ -225 +225 @@
                 throw exception::basic(exception::MODULE_XEXEC, XEXECEX_MODULE, exception::ERRNO_DYNLOAD, 0, dlerror(), __LINE__, __FILE__);
 
-        moduleInit init = (moduleInit)dlsym(handle, "initXexecModule");
+        initModule init = (initModule)dlsym(handle, "initXexecModule");
         if (init == NULL)
                 throw exception::basic(exception::MODULE_XEXEC, XEXECEX_MODULE, exception::ERRNO_DYNLOAD, 0, dlerror(), __LINE__, __FILE__);
@@ -261 +261 @@
                 throw exception::basic(exception::MODULE_XEXEC, XEXECEX_ADDXEXEC, exception::ERRNO_DYNLOAD, 0, dlerror(), __LINE__, __FILE__);
 
-        moduleInit init = (moduleInit)dlsym(e.handle, "initXexecModule");
+        initModule init = (initModule)dlsym(e.handle, "initXexecModule");
         if (init == NULL)
                 throw exception::basic(exception::MODULE_XEXEC, XEXECEX_ADDXEXEC, exception::ERRNO_DYNLOAD, 0, dlerror(), __LINE__, __FILE__);
@@ -284 +284 @@
                 postExecId = e.id;
         }
+
+        deinitModule deinit = (deinitModule)dlsym(e.handle, "deinitXexecModule");
+        if (deinit == NULL)
+                throw exception::basic(exception::MODULE_XEXEC, XEXECEX_ADDXEXEC, exception::ERRNO_DYNLOAD, 0, dlerror(), __LINE__, __FILE__);
+
+        deinit();
 }