[GNUnet-SVN] r25917 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-01-25 21:38:28 +0100 (Fri, 25 Jan 2013)
New Revision: 25917

Modified:
   gnunet/src/testbed/gnunet-service-testbed.c
   gnunet/src/testbed/gnunet-service-testbed.h
   gnunet/src/testbed/testbed.conf.in
Log:
read MAX_OPEN_FDS from configuration

Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2013-01-25 17:50:05 UTC (rev 
25916)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2013-01-25 20:38:28 UTC (rev 
25917)
@@ -2188,13 +2188,18 @@
                                                         &num));
   GST_cache_init ((unsigned int) num);
   GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED",
+                                                        "MAX_OPEN_FDS",
+                                                        &num));
+  GST_opq_openfds = 
+      GNUNET_TESTBED_operation_queue_create_ ((unsigned int) num);
+  GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
                                                         "HOSTNAME", 
&hostname));
   our_config = GNUNET_CONFIGURATION_dup (cfg);
   GNUNET_SERVER_add_handlers (server, message_handlers);
   GNUNET_SERVER_disconnect_notify (server, &client_disconnect_cb, NULL);
   ss_map = GNUNET_CONTAINER_multihashmap_create (5, GNUNET_NO);
-  GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ (GST_QLEN_OPENFDS);
   shutdown_task_id =
       GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
                                                   
GNUNET_SCHEDULER_PRIORITY_IDLE,

Modified: gnunet/src/testbed/gnunet-service-testbed.h
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.h 2013-01-25 17:50:05 UTC (rev 
25916)
+++ gnunet/src/testbed/gnunet-service-testbed.h 2013-01-25 20:38:28 UTC (rev 
25917)
@@ -55,11 +55,6 @@
 #define LIST_GROW_STEP 10
 
 /**
- * How long should the operation queue for open file descriptors be?
- */
-#define GST_QLEN_OPENFDS 512
-
-/**
  * Default timeout for operations which may take some time
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 15)

Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in  2013-01-25 17:50:05 UTC (rev 25916)
+++ gnunet/src/testbed/testbed.conf.in  2013-01-25 20:38:28 UTC (rev 25917)
@@ -12,6 +12,7 @@
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 MAX_PARALLEL_OPERATIONS = 1000
-MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
+MAX_PARALLEL_SERVICE_CONNECTIONS = 256
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1
 HELLO_CACHE_SIZE = 30
+MAX_OPEN_FDS = 512