Changeset 9:fc7c18867cf7 in freeDiameter

Timestamp:

Sep 24, 2009, 2:01:48 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

New extension mechanism committed

Files:

• CMakeLists.txt (modified) (1 diff)
• doc/freediameter.conf.sample (modified) (1 diff)
• extensions/CMakeLists.txt (modified) (1 diff)
• extensions/_sample/CMakeLists.txt (modified) (1 diff)
• extensions/_sample/fini.c (modified) (1 diff)
• extensions/_sample/sample.c (modified) (2 diffs)
• freeDiameter/extensions.c (modified) (1 diff)
• freeDiameter/main.c (modified) (1 diff)
• include/freeDiameter/freeDiameter-host.h.in (modified) (1 diff)

CMakeLists.txt

@@ -23 +23 @@
 # All source code should be POSIX 200112L compatible, but some other extensions might be used, so:
 ADD_DEFINITIONS(-D_GNU_SOURCE)
+IF (CMAKE_BUILD_TYPE MATCHES "Debug")
+  SET(DEBUG 1)
+ENDIF (CMAKE_BUILD_TYPE MATCHES "Debug")
 
 # some subfolders use yacc and lex parsers

doc/freediameter.conf.sample

@@ -129 +129 @@
 TwTimer = 6;
 NoRelay;
-LoadExtension = "extensions/sample.so";
-LoadExtension = "extensions/sample.so":"conf/sample.conf";
+#LoadExtension = "extensions/sample.fdx";
+LoadExtension = "extensions/sample.fdx":"conf/sample.conf";

extensions/CMakeLists.txt

@@ -3 +3 @@
 # We want all resulting objects in the same folder
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-# And named fdext_XXX instead of libXXX.so
 
-#-- faire une macro ici!
-SET(FD_EXT_PREFIX "fdext_" PARENT_SCOPE)
-SET(FD_EXT_SUFFIX "" PARENT_SCOPE)
+# Use the macro FD_ADD_EXTENSION(name files...) to create an extension
+# It is equivalent to add_library with the appropriate parameters
+# and naming conventions (.fdx : FreeDiameter eXtension)
+MACRO(FD_ADD_EXTENSION EXTNAME)
+  ADD_LIBRARY(${EXTNAME} MODULE ${ARGN})
+  SET_TARGET_PROPERTIES(${EXTNAME} PROPERTIES PREFIX "" )
+  SET_TARGET_PROPERTIES(${EXTNAME} PROPERTIES SUFFIX ".fdx" )
+ENDMACRO(FD_ADD_EXTENSION)
 
 ###########################

extensions/_sample/CMakeLists.txt

@@ -3 +3 @@
 
 # Compile as a module
-ADD_LIBRARY(sample MODULE sample.c fini.c)
-
-# Comply to naming scheme
-SET_TARGET_PROPERTIES(sample PROPERTIES PREFIX "${FD_EXT_PREFIX}" )
-SET_TARGET_PROPERTIES(sample PROPERTIES SUFFIX "${FD_EXT_SUFFIX}" )
+FD_ADD_EXTENSION(sample sample.c fini.c)

extensions/_sample/fini.c

@@ -40 +40 @@
 void fd_ext_fini(void)
 {
-        log_debug("Extension is terminated... Bye!\n");
+        fd_log_debug("Extension is terminated... Bye!\n");
         return ;
 }

extensions/_sample/sample.c

@@ -56 +56 @@
         
         /* Use the dictionary for test */
-        log_debug("Let's create that 'Example-AVP'...\n");
+        fd_log_debug("Let's create that 'Example-AVP'...\n");
         {
                 struct dict_object * origin_host_avp = NULL;
@@ -79 +79 @@
                 CHECK_FCT( fd_dict_new ( fd_g_config->g_dict, DICT_RULE, &rule_data, example_avp_avp, NULL ));
         }
-        log_debug("'Example-AVP' created without error\n");
+        fd_log_debug("'Example-AVP' created without error\n");
         
         return 0;

freeDiameter/extensions.c

@@ -97 +97 @@
                 
                 /* Load the extension */
+#ifndef DEBUG
                 ext->handler = dlopen(ext->filename, RTLD_LAZY | RTLD_GLOBAL);
+#else /* DEBUG */
+                /* We resolve immediatly so it's easier to find problems in ABI */
+                ext->handler = dlopen(ext->filename, RTLD_NOW | RTLD_GLOBAL);
+#endif /* DEBUG */
                 if (ext->handler == NULL) {
                         /* An error occured */

freeDiameter/main.c

@@ -247 +247 @@
         
         /* cleanups */
-        CHECK_FCT( fd_thr_term(&sig_th) );
+        CHECK_FCT_DO( fd_ext_fini(), /* continue */ );
+        CHECK_FCT_DO( fd_thr_term(&sig_th), /* continue */ );
         
         return ret;

include/freeDiameter/freeDiameter-host.h.in

@@ -46 +46 @@
 #cmakedefine DISABLE_SCTP
 
+#cmakedefine DEBUG
+
 #cmakedefine FD_PROJECT_BINARY "@FD_PROJECT_BINARY@"
 #cmakedefine FD_PROJECT_NAME "@FD_PROJECT_NAME@"