Changeset 695:712a0bb8d3bf in freeDiameter

Timestamp:

Jan 21, 2011, 4:18:39 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Add ability to skip dlclose() calls since it creates problems on FreeBSD8.1 64bits

Files:

• include/freeDiameter/freeDiameter-host.h.in (modified) (1 diff)
• libfdcore/extensions.c (modified) (2 diffs)
• tests/testloadext.c (modified) (2 diffs)
• tests/tests.h (modified) (1 diff)

include/freeDiameter/freeDiameter-host.h.in

@@ -48 +48 @@
 #cmakedefine SCTP_USE_MAPPED_ADDRESSES
 #cmakedefine SCTP_CONNECTX_4_ARGS
+#cmakedefine SKIP_DLCLOSE
 
 #cmakedefine ERRORS_ON_TODO

libfdcore/extensions.c

@@ -172 +172 @@
                 }
                 
+#ifndef SKIP_DLCLOSE
                 /* Now unload the extension */
                 if (ext->handler) {
@@ -179 +180 @@
                         }
                 }
+#endif /* SKIP_DLCLOSE */
                 
                 /* Free the object and continue */

tests/testloadext.c

@@ -69 +69 @@
                         /* We found a file with name *.fdx, attempt to load it */
                         void *hdl, * ep;
-                        int r;
                         snprintf(fullname + pathlen, sizeof(fullname) - pathlen, "%s", dp->d_name);
                         
@@ -89 +88 @@
                         
                         /* Done, now unload */
-                        r = dlclose(hdl);
-                        if (r) {
-                                TRACE_DEBUG(INFO, "Unable to dlclose '%s': %s.", fullname, dlerror());
-                        }
-                        CHECK( 0, r );
+#ifndef SKIP_DLCLOSE
+                        CHECK( 0, dlclose(hdl) );
+#endif /* SKIP_DLCLOSE */
                 }
         }

tests/tests.h

@@ -110 +110 @@
         int sig;
         sigset_t ss;
-        fd_log_threadname ( "timeout catcher" );
+        fd_log_threadname ( "Test alarm catcher" );
         
         sigemptyset(&ss);