Changeset 615:8abafd66a617 in freeDiameter

Timestamp:

Dec 3, 2010, 1:31:41 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Adapt test for systems that cannot create many threads per process, such as OpenSUSE (bouuuuh)

File:

• freeDiameter/tests/testfifo.c (modified) (8 diffs)

freeDiameter/tests/testfifo.c

@@ -35 +35 @@
 
 #include "tests.h"
+#include <unistd.h>
 
 /* Structure for testing threshold function */
@@ -203 +204 @@
                 int                      count;
                 int                      i;
+                int                      nbr_threads;
+                
+                nbr_threads = sysconf(_SC_THREAD_THREADS_MAX);
+                if ((nbr_threads <= 0) || (nbr_threads > NBR_THREADS / 2)) {
+                        nbr_threads = NBR_THREADS;
+                } else {
+                        /* The local limit is bellow NBR_THREADS */
+                        nbr_threads = (nbr_threads / 2) - 1;
+                        /* Ensure we create at least a few threads! */
+                        CHECK( 1, nbr_threads >= 10 ? 1 : 0 );
+                }
                 
                 /* Create the queue */
@@ -208 +220 @@
                 
                 /* Create the barrier */
-                CHECK( 0, pthread_barrier_init(&bar, NULL, NBR_THREADS * 2 + 1) );
+                CHECK( 0, pthread_barrier_init(&bar, NULL, nbr_threads * 2 + 1) );
                 
                 /* Initialize the ts */
@@ -216 +228 @@
                 /* Create the messages */
                 CHECK( 0, fd_dict_search ( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Device-Watchdog-Request",         &dwr_model, ENOENT ) );
-                for (i = 0; i < NBR_MSG * NBR_THREADS * 2; i++) {
+                for (i = 0; i < NBR_MSG * nbr_threads * 2; i++) {
                         CHECK( 0, fd_msg_new ( dwr_model, 0, &msgs[i] ) );
                 }
@@ -231 +243 @@
                 
                 /* Create the threads */
-                for (i=0; i < NBR_THREADS * 2; i++) {
+                for (i=0; i < nbr_threads * 2; i++) {
                         CHECK( 0, pthread_create( &thr[i], NULL, test_fct, (i & 1) ? &td_1 : &td_2 ) );
                 }
@@ -246 +258 @@
                 
                 /* Now post all the messages */
-                for (i=0; i < NBR_MSG * NBR_THREADS * 2; i++) {
+                for (i=0; i < NBR_MSG * nbr_threads * 2; i++) {
                         msg = msgs[i];
                         CHECK( 0, fd_fifo_post(queue, &msg) );
@@ -252 +264 @@
                 
                 /* Join all threads. This blocks if messages are lost... */
-                for (i=0; i < NBR_THREADS * 2; i++) {
+                for (i=0; i < nbr_threads * 2; i++) {
                         CHECK( 0, pthread_join( thr[i], NULL ) );
                 }
@@ -262 +274 @@
                 /* Destroy this queue and the messages */
                 CHECK( 0, fd_fifo_del(&queue) );
-                for (i=0; i < NBR_MSG * NBR_THREADS * 2; i++) {
+                for (i=0; i < NBR_MSG * nbr_threads * 2; i++) {
                         CHECK( 0, fd_msg_free(  msgs[i] ) );
                 }