diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-05-09 09:45:53 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-05-09 09:45:53 +0000 |
commit | efad1d6733cd7e75a4e6c846ad7c031a0167b8be (patch) | |
tree | 93c8d652b78ae04b5b4a5c8e1e8abe398d4dd8c7 /src/testbed/gnunet-service-testbed.c | |
parent | d96c9d244148f2ee984c206b71987ba6df0ec820 (diff) | |
download | gnunet-efad1d6733cd7e75a4e6c846ad7c031a0167b8be.tar.gz gnunet-efad1d6733cd7e75a4e6c846ad7c031a0167b8be.zip |
- complement HELPER API with functions to kill and wait on the helper process
- To shutdown quickly, have testbed first kill all sub-controller's helper
processes first and wait later instead of kill & wait per each processes.
Diffstat (limited to 'src/testbed/gnunet-service-testbed.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index bb791988e..1b74ad1df 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -785,7 +785,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
785 | uint32_t id; | 785 | uint32_t id; |
786 | 786 | ||
787 | shutdown_task_id = GNUNET_SCHEDULER_NO_TASK; | 787 | shutdown_task_id = GNUNET_SCHEDULER_NO_TASK; |
788 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down testbed service\n"); | 788 | LOG_DEBUG ("Shutting down testbed service\n"); |
789 | /* cleanup any remaining forwarded operations */ | 789 | /* cleanup any remaining forwarded operations */ |
790 | GST_clear_fopcq (); | 790 | GST_clear_fopcq (); |
791 | GST_free_lcfq (); | 791 | GST_free_lcfq (); |
@@ -904,6 +904,7 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
904 | char *logfile; | 904 | char *logfile; |
905 | unsigned long long num; | 905 | unsigned long long num; |
906 | 906 | ||
907 | LOG_DEBUG ("Starting testbed\n"); | ||
907 | if (GNUNET_OK == | 908 | if (GNUNET_OK == |
908 | GNUNET_CONFIGURATION_get_value_filename (cfg, "TESTBED", "LOG_FILE", | 909 | GNUNET_CONFIGURATION_get_value_filename (cfg, "TESTBED", "LOG_FILE", |
909 | &logfile)) | 910 | &logfile)) |