Changeset 693:16c373df0947 in freeDiameter

Timestamp:

Jan 21, 2011, 3:12:54 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanups

Files:

• libfdcore/core.c (modified) (2 diffs)
• libfdproto/init.c (modified) (2 diffs)
• tests/tests.h (modified) (3 diffs)

libfdcore/core.c

@@ -69 +69 @@
 static void * core_runner_thread(void * arg) 
 {
-        fd_log_threadname("Core Runner");
-        
         if (arg && (*(int *)arg == CORE_MODE_IMMEDIATE))
                 goto end;
+        
+        fd_log_threadname("fD Core Runner");
         
         /* Handle events incoming on the main event queue */
@@ -131 +131 @@
 end:
         TRACE_DEBUG(INFO, FD_PROJECT_BINARY " framework is stopping...");
+        fd_log_threadname("fD Core Shutdown");
         
         /* cleanups */

libfdproto/init.c

@@ -39 +39 @@
 pthread_mutex_t fd_cpu_mtx_dummy = PTHREAD_MUTEX_INITIALIZER;
 
+/* function to free the threadnames */
+static void freelogstr(void * str) {
+        if (TRACE_BOOL(ANNOYING)) {
+                if (str) {
+                        fd_log_debug("(Thread '%s' terminating)\n", (char *)str);
+                }
+        }
+        free(str);
+}
+
 /* Initialize library variables and threads */
 int fd_libproto_init()
@@ -45 +55 @@
         
         /* Create the thread key that contains thread name for debug messages */
-        ret = pthread_key_create(&fd_log_thname, free);
+        ret = pthread_key_create(&fd_log_thname, freelogstr);
         if (ret != 0) {
                 fprintf(stderr, "Error initializing the libfreeDiameter library: %s\n", strerror(ret) );

tests/tests.h

@@ -169 +169 @@
 }
  
-static inline void test_init(int argc, char * argv[])
+static inline void test_init(int argc, char * argv[], char *fname)
 {
         memset(fd_g_config, 0, sizeof(struct fd_config));
@@ -175 +175 @@
         CHECK( 0, fd_libproto_init() );
         
-        fd_log_threadname(basename(__FILE__));
+        fd_log_threadname(basename(fname));
         
         /* Initialize gcrypt and gnutls */
@@ -199 +199 @@
         return;
 }
-#define INIT_FD()  test_init(argc, argv);
+#define INIT_FD()  test_init(argc, argv, __FILE__);
 
 #endif /* _TESTS_H */