[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26119 - gnunet/src/testbed
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26119 - gnunet/src/testbed |
|
Date: |
Thu, 14 Feb 2013 17:46:59 +0100 |
Author: harsha
Date: 2013-02-14 17:46:58 +0100 (Thu, 14 Feb 2013)
New Revision: 26119
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/gnunet-service-testbed.h
gnunet/src/testbed/gnunet-service-testbed_oc.c
gnunet/src/testbed/testbed.conf.in
Log:
fix 2793: Testbed does not allow to set TIMEOUT for operations
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2013-02-14 16:15:26 UTC (rev
26118)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2013-02-14 16:46:58 UTC (rev
26119)
@@ -74,6 +74,11 @@
struct OperationQueue *GST_opq_openfds;
/**
+ * Timeout for operations which may take some time
+ */
+const struct GNUNET_TIME_Relative GST_timeout;
+
+/**
* The size of the host list
*/
unsigned int GST_host_list_size;
@@ -765,7 +770,7 @@
&lcf_forwarded_operation_reply_relay,
lcf);
lcf->fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&lcf_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&lcf_forwarded_operation_timeout,
lcf);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, lcf->fopc);
lcf->state = FINISHED;
@@ -1558,7 +1563,7 @@
&msg->header,
peer_create_success_cb, fo_ctxt);
fo_ctxt->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &peer_create_forward_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &peer_create_forward_timeout,
fo_ctxt);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fo_ctxt);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1610,7 +1615,7 @@
fopc->operation_id,
&msg->header,
&peer_destroy_success_cb, fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&GST_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&GST_forwarded_operation_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1669,7 +1674,7 @@
&GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&GST_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&GST_forwarded_operation_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1739,7 +1744,7 @@
&GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&GST_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&GST_forwarded_operation_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1815,7 +1820,7 @@
&GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&GST_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&GST_forwarded_operation_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -2197,8 +2202,14 @@
"MAX_OPEN_FDS", &num));
GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
num);
GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED",
+ "OPERATION_TIMEOUT",
+ (struct
+ GNUNET_TIME_Relative *)
+ &GST_timeout));
+ GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
- "HOSTNAME",
&hostname));
+ "HOSTNAME",
&hostname));
our_config = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_SERVER_add_handlers (server, message_handlers);
GNUNET_SERVER_disconnect_notify (server, &client_disconnect_cb, NULL);
Modified: gnunet/src/testbed/gnunet-service-testbed.h
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.h 2013-02-14 16:15:26 UTC (rev
26118)
+++ gnunet/src/testbed/gnunet-service-testbed.h 2013-02-14 16:46:58 UTC (rev
26119)
@@ -54,12 +54,7 @@
*/
#define LIST_GROW_STEP 10
-/**
- * Default timeout for operations which may take some time
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 15)
-
/**
* A routing entry
*/
@@ -611,6 +606,11 @@
extern struct OperationQueue *GST_opq_openfds;
/**
+ * Timeout for operations which may take some time
+ */
+const extern struct GNUNET_TIME_Relative GST_timeout;
+
+/**
* The size of the peer list
*/
extern unsigned int GST_peer_list_size;
Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-02-14 16:15:26 UTC
(rev 26118)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-02-14 16:46:58 UTC
(rev 26119)
@@ -381,7 +381,7 @@
GNUNET_free (focc->orig_msg);
focc->orig_msg = NULL;
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&forwarded_overlay_connect_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&forwarded_overlay_connect_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
}
@@ -1221,7 +1221,7 @@
&GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&GST_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
&GST_forwarded_operation_timeout,
fopc);
GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1264,7 +1264,7 @@
occ->peer2_controller = peer2_controller;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->timeout_task);
occ->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_overlay_connect, occ);
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &timeout_overlay_connect,
occ);
/* Get the identity of the second peer */
if (NULL != occ->peer2_controller)
{
@@ -1564,7 +1564,7 @@
&cache_transport_peer_connect_notify,
rocc);
rocc->timeout_rocc_task_id =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_rocc_task, rocc);
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &timeout_rocc_task, rocc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in 2013-02-14 16:15:26 UTC (rev 26118)
+++ gnunet/src/testbed/testbed.conf.in 2013-02-14 16:46:58 UTC (rev 26119)
@@ -4,6 +4,7 @@
HOSTNAME = localhost
HOME = $SERVICEHOME
BINARY = gnunet-service-testbed
+OPERATION_TIMEOUT = 30 s
# Set this to the path where the testbed helper is installed
# HELPER_BINARY_PATH = @prefix@/lib/gnunet/libexec/gnunet-helper-testbed
ACCEPT_FROM = 127.0.0.1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26119 - gnunet/src/testbed,
gnunet <=