Changeset 729:5d8ac5da7092 in freeDiameter for tests/tests.h

Timestamp:

Feb 24, 2011, 5:19:14 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fixed timeout handling + minor fixes

File:

• tests/tests.h (modified) (5 diffs)

tests/tests.h

@@ -77 +77 @@
         (void)fd_core_shutdown();                       \
         (void)fd_core_wait_shutdown_complete();         \
-        (void)fd_thr_term(&timeout_thr);                \
+        (void)fd_thr_term(&signal_thr);                 \
         exit(PASS);                                     \
 }
@@ -105 +105 @@
 }
 
-static pthread_t timeout_thr;
-static void * timeout_catch(void * arg)
+static pthread_t signal_thr;
+static void * signal_catch(void * arg)
 {
         int sig;
         sigset_t ss;
-        fd_log_threadname ( "Test alarm catcher" );
+        fd_log_threadname ( "Signal catcher" );
         
         sigemptyset(&ss);
+        
+        /* We use SIGALRM */
         sigaddset(&ss, SIGALRM);
         
+        /* Unblock any other signal for this thread, so that default handler is enabled */
+        CHECK_SYS_DO( pthread_sigmask( SIG_SETMASK, &ss, NULL ), );
+        
+        /* Now wait for sigwait or cancelation */
         CHECK_POSIX_DO( sigwait(&ss, &sig),  );
-        
         FAILTEST("The timeout (" _stringize(TEST_TIMEOUT) " sec) was reached. Use -n or change TEST_TIMEOUT if the test needs more time to execute.");
         
@@ -165 +170 @@
         if (!no_timeout) {
                 alarm(TEST_TIMEOUT);
-                CHECK( 0, pthread_create(&timeout_thr, NULL, timeout_catch, NULL) );
         }
+        CHECK( 0, pthread_create(&signal_thr, NULL, signal_catch, NULL) );
 }
  
 static inline void test_init(int argc, char * argv[], char *fname)
 {
+        sigset_t sig_all;
+        sigfillset(&sig_all);
+        
+        CHECK( 0, pthread_sigmask(SIG_BLOCK, &sig_all, NULL));
+        
         memset(fd_g_config, 0, sizeof(struct fd_config));
         
@@ -176 +186 @@
         
         fd_log_threadname(basename(fname));
+        
+        /* Parse the command line */
+        parse_cmdline(argc, argv);
         
         /* Initialize gcrypt and gnutls */
@@ -194 +207 @@
         CHECK( 0, fd_sess_start()  );
         
-        /* Parse the command line */
-        parse_cmdline(argc, argv);
-        
         return;
 }