Changeset 658:f198d16fa7f4 in freeDiameter for tests/tests.h

Timestamp:

Jan 14, 2011, 3:15:23 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Initial commit for 1.1.0:

• Restructuring:
  • libfreeDiameter:
    • renamed folder & binary into libfdproto
    • renamed libfD.h into fdproto-internal.h
    • removed signals management (replaced by triggers in libfdcore)

• freeDiameter split into:
  • libfdcore (most contents)
    • renamed fD.h into fdcore-internal.h
    • added core.c for framework init/shutdown.
    • new triggers mechanism in events.c.

• freeDiameterd (main, command line parsing, signals management)

• tests:
  • now in top-level directory tests.

• other changes:
  • fd_dict_new now returns 0 on duplicate identical entries.
  • fixes in dict_legacy_xml
  • fixes in some dictionaries
  • moved FD_DEFAULT_CONF_FILENAME definition to freeDiameter-host.h

File:

• tests/tests.h (moved) (moved from freeDiameter/tests/tests.h) (4 diffs)

tests/tests.h

@@ -42 +42 @@
 #define _TESTS_H
 
-#include "libfD.h"
-#include "fD.h"
+#include "fdproto-internal.h"
+#include "fdcore-internal.h"
 
 #include <pthread.h>
@@ -82 +82 @@
 struct fd_config * fd_g_config = &conf;
 
-/* gcrypt functions to support posix threads */
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
 /* Define the standard check routines */
 #define CHECK( _val, _assert ){                         \
@@ -105 +102 @@
 }
 
-/* Minimum inits */
-#define INIT_FD() {                                                             \
-        memset(fd_g_config, 0, sizeof(struct fd_config));                       \
-        CHECK( 0, fd_lib_init(1) );                                             \
-        fd_log_threadname(basename(__FILE__));                                  \
-        (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);    \
-        (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);                   \
-        CHECK( 0, gnutls_global_init());                                        \
-        CHECK( 0, fd_conf_init() );                                             \
-        CHECK( 0, fd_dict_base_protocol(fd_g_config->cnf_dict) );               \
-        CHECK( 0, fd_sess_start() );                                            \
-        parse_cmdline(argc, argv);                                              \
+static pthread_t timeout_thr;
+static void * timeout_catch(void * arg)
+{
+        int sig;
+        sigset_t ss;
+        fd_log_threadname ( "timeout catcher" );
+        
+        sigemptyset(&ss);
+        sigaddset(&ss, SIGALRM);
+        
+        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.");
+        
+        return NULL;
 }
+        
 
-static void test_timeout(int signal)
-{
-        FAILTEST("The timeout (" _stringize(TEST_TIMEOUT) " sec) was reached. Use -n or change TEST_TIMEOUT if the test needs more time to execute.");
-}
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 static inline void parse_cmdline(int argc, char * argv[]) {
@@ -164 +162 @@
         if (!no_timeout) {
                 alarm(TEST_TIMEOUT);
-                fd_sig_register(SIGALRM, "Test.harness", test_timeout);
+                CHECK( 0, pthread_create(&timeout_thr, NULL, timeout_catch, NULL) );
         }
 }
  
+static inline void test_init(int argc, char * argv[])
+{
+        memset(fd_g_config, 0, sizeof(struct fd_config));
+        
+        CHECK( 0, fd_libproto_init() );
+        
+        fd_log_threadname(basename(__FILE__));
+        
+        /* Initialize gcrypt and gnutls */
+        (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+        (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+        CHECK( 0, gnutls_global_init());
+        
+        /* Initialize the config */
+        CHECK( 0, fd_conf_init() );
+
+        /* Add definitions of the base protocol */
+        CHECK( 0, fd_dict_base_protocol(fd_g_config->cnf_dict) );
+        
+        /* Initialize only the sessions */
+        CHECK( 0, fd_sess_start()  );
+        
+        /* Parse the command line */
+        parse_cmdline(argc, argv);
+        
+        return;
+}
+#define INIT_FD()  test_init(argc, argv);
+
 #endif /* _TESTS_H */