From 458cb34da45e855162c96fc4735f168e36a323c9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 23 Oct 2011 13:35:03 +0000 Subject: make writing data_output optional and disable by default --- src/mesh/test_mesh_small.c | 23 +++++++++-------------- src/mesh/test_mesh_small.conf | 2 +- src/mesh/test_mesh_small_unicast_far.c | 24 ++++++++++-------------- 3 files changed, 20 insertions(+), 29 deletions(-) (limited to 'src/mesh') diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index f100a40e4..0888c1e00 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -140,8 +140,6 @@ static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle; static char *topology_file; -static char *data_filename; - static struct GNUNET_TESTING_Daemon *d1; static GNUNET_PEER_Id pid1; @@ -753,6 +751,7 @@ run (void *cls, char *const *args, const char *cfgfile, char *temp_str; unsigned long long temp_wait; struct GNUNET_TESTING_Host *hosts; + char *data_filename; ok = 0; testing_cfg = GNUNET_CONFIGURATION_dup (cfg); @@ -801,27 +800,23 @@ run (void *cls, char *const *args, const char *cfgfile, return; } - if (GNUNET_OK != + if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small", "data_output_file", &data_filename)) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Option test_mesh_small:data_output_file is required!\n"); - return; - } - - data_file = + data_file = GNUNET_DISK_file_open (data_filename, GNUNET_DISK_OPEN_READWRITE | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE); - if (data_file == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n", - data_filename); - GNUNET_free (data_filename); + if (data_file == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n", + data_filename); + GNUNET_free (data_filename); + } } wait_time = diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index f98dca7dc..9e340aacb 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf @@ -87,4 +87,4 @@ DELETE_FILES = YES [test_mesh_small] WAIT_TIME = 300 CONNECTION_LIMIT = 16 -DATA_OUTPUT_FILE=data_output +#DATA_OUTPUT_FILE=data_output diff --git a/src/mesh/test_mesh_small_unicast_far.c b/src/mesh/test_mesh_small_unicast_far.c index d5a768f98..f5bab6fb4 100644 --- a/src/mesh/test_mesh_small_unicast_far.c +++ b/src/mesh/test_mesh_small_unicast_far.c @@ -120,8 +120,6 @@ static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle; static char *topology_file; -static char *data_filename; - static struct GNUNET_TESTING_Daemon *d1; static struct GNUNET_TESTING_Daemon *d2; @@ -460,6 +458,8 @@ run (void *cls, char *const *args, const char *cfgfile, char *temp_str; unsigned long long temp_wait; struct GNUNET_TESTING_Host *hosts; + char *data_filename; + ok = 1; testing_cfg = GNUNET_CONFIGURATION_dup (cfg); @@ -516,27 +516,23 @@ run (void *cls, char *const *args, const char *cfgfile, return; } - if (GNUNET_OK != + if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small", "data_output_file", &data_filename)) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Option test_mesh_small:data_output_file is required!\n"); - return; - } - - data_file = + data_file = GNUNET_DISK_file_open (data_filename, GNUNET_DISK_OPEN_READWRITE | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE); - if (data_file == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n", - data_filename); - GNUNET_free (data_filename); + if (data_file == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n", + data_filename); + GNUNET_free (data_filename); + } } wait_time = -- cgit v1.2.3