Changeset 253:ad6c0118fb50 in freeDiameter

Timestamp:

Apr 13, 2010, 2:50:54 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Configurable number of server threads

Files:

• doc/freediameter.conf.sample (modified) (1 diff)
• freeDiameter/config.c (modified) (2 diffs)
• freeDiameter/fdd.l (modified) (1 diff)
• freeDiameter/fdd.y (modified) (3 diffs)
• freeDiameter/main.c (modified) (1 diff)
• freeDiameter/routing_dispatch.c (modified) (4 diffs)
• include/freeDiameter/freeDiameter.h (modified) (1 diff)

doc/freediameter.conf.sample

@@ -144 +144 @@
 # Default: Relaying is enabled.
 #NoRelay;
+
+# Number of server threads that can handle incoming messages at the same time.
+#  TODO: implement dynamic # of threads depending on the length of the queue.
+# Default: 4
+#AppServThreads = 4;
 
 # Other applications are configured by loading appropriate extensions.

freeDiameter/config.c

@@ -59 +59 @@
         fd_g_config->cnf_port_tls = 3869;
         fd_g_config->cnf_sctp_str = 30;
+        fd_g_config->cnf_dispthr  = 4;
         fd_list_init(&fd_g_config->cnf_endpoints, NULL);
         fd_list_init(&fd_g_config->cnf_apps, NULL);
@@ -92 +93 @@
         fd_log_debug("  Local secure port ...... : %hu\n", fd_g_config->cnf_port_tls);
         fd_log_debug("  Number of SCTP streams . : %hu\n", fd_g_config->cnf_sctp_str);
+        fd_log_debug("  Number of server threads : %hu\n", fd_g_config->cnf_dispthr);
         if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
                 fd_log_debug("  Local endpoints ........ : Default (use all available)\n");

freeDiameter/fdd.l

@@ -123 +123 @@
 (?i:"TLS_old_method")   { return OLDTLS;        }
 (?i:"SCTP_streams")     { return SCTPSTREAMS;   }
+(?i:"AppServThreads")   { return APPSERVTHREADS;}
 (?i:"ListenOn")         { return LISTENON;      }
 (?i:"TcTimer")          { return TCTIMER;       }

freeDiameter/fdd.y

@@ -105 +105 @@
 %token          NOTLS
 %token          SCTPSTREAMS
+%token          APPSERVTHREADS
 %token          LISTENON
 %token          TCTIMER
@@ -133 +134 @@
                         | conffile listenon
                         | conffile norelay
+                        | conffile appservthreads
                         | conffile noip
                         | conffile noip6
@@ -231 +233 @@
                         ;
 
+appservthreads:         APPSERVTHREADS '=' INTEGER ';'
+                        {
+                                CHECK_PARAMS_DO( ($3 > 0) && ($3 < 1024),
+                                        { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } );
+                                conf->cnf_dispthr = (uint16_t)$3;
+                        }
+                        ;
+
 noip:                   NOIP ';'
                         {

freeDiameter/main.c

@@ -96 +96 @@
         CHECK_FCT(  fd_msg_init()  );
         CHECK_FCT(  fd_p_expi_init()  );
-        CHECK_FCT(  fd_rtdisp_init()  );
         
         /* Parse the configuration file */
         CHECK_FCT( fd_conf_parse() );
+        
+        /* Create the daemon's threads */
+        CHECK_FCT(  fd_rtdisp_init()  );
         
         /* Load the dynamic extensions */

freeDiameter/routing_dispatch.c

@@ -1070 +1070 @@
 /********************************************************************************/
 
+static pthread_t * dispatch = NULL;
+static enum thread_state * disp_state = NULL;
+
 /* Later: make this more dynamic */
-static pthread_t dispatch = (pthread_t)NULL;
-static enum thread_state disp_state = INITIAL;
-
 static pthread_t rt_out = (pthread_t)NULL;
 static enum thread_state out_state = INITIAL;
@@ -1083 +1083 @@
 int fd_rtdisp_init(void)
 {
-        CHECK_POSIX( pthread_create( &dispatch, NULL, dispatch_thr, &disp_state ) );
+        int i;
+        
+        /* Prepare the array for dispatch */
+        CHECK_MALLOC( dispatch = calloc(fd_g_config->cnf_dispthr, sizeof(pthread_t)) );
+        CHECK_MALLOC( disp_state = calloc(fd_g_config->cnf_dispthr, sizeof(enum thread_state)) );
+        
+        /* Create the threads */
+        for (i=0; i < fd_g_config->cnf_dispthr; i++) {
+                CHECK_POSIX( pthread_create( &dispatch[i], NULL, dispatch_thr, &disp_state[i] ) );
+        }
         CHECK_POSIX( pthread_create( &rt_out, NULL, routing_out_thr, &out_state) );
         CHECK_POSIX( pthread_create( &rt_in,  NULL, routing_in_thr,  &in_state) );
@@ -1139 +1148 @@
 int fd_rtdisp_fini(void)
 {
+        int i;
+        
         /* Destroy the incoming queue */
         CHECK_FCT_DO( fd_queues_fini(&fd_g_incoming), /* ignore */);
@@ -1155 +1166 @@
         
         /* Stop the Dispatch thread */
-        stop_thread_delayed(&disp_state, &dispatch, "Dispatching");
+        for (i=0; i < fd_g_config->cnf_dispthr; i++) {
+                stop_thread_delayed(&disp_state[i], &dispatch[i], "Dispatching");
+        }
         
         return 0;

include/freeDiameter/freeDiameter.h

@@ -91 +91 @@
         struct fd_list   cnf_endpoints; /* the local endpoints to bind the server to. list of struct fd_endpoint. default is empty (bind all) */
         struct fd_list   cnf_apps;      /* Applications locally supported (except relay, see flags). Use fd_disp_app_support to add one. list of struct fd_app. */
+        uint16_t         cnf_dispthr;   /* Number of dispatch threads to create */
         struct {
                 unsigned no_fwd : 1;    /* the peer does not relay messages (0xffffff app id) */