Boston, MA 02111-1307, USA.
*/
/**
- * @file nse/nse-profiler.c
+ * @file nse/gnunet-nse-profiler.c
*
* @brief Profiling driver for the network size estimation service.
* Generally, the profiler starts a given number of peers,
#include "gnunet_testing_lib.h"
#include "gnunet_nse_service.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE 3
struct NSEPeer
{
struct GNUNET_TESTING_Daemon *daemon;
struct GNUNET_NSE_Handle *nse_handle;
+
+ struct GNUNET_STATISTICS_Handle *stats;
+
+ GNUNET_SCHEDULER_TaskIdentifier stats_task;
};
struct StatsContext
{
- unsigned long long total_nse_bytes;
+ /**
+ * Whether or not shoutdown after finishing.
+ */
+ int shutdown;
+
+ /**
+ * How many messages have peers received during the test.
+ */
+ unsigned long long total_nse_received_messages;
+
+ /**
+ * How many messages have peers send during the test (should be == received).
+ */
+ unsigned long long total_nse_transmitted_messages;
+
+ /**
+ * How many messages have travelled an edge in both directions.
+ */
+ unsigned long long total_nse_cross;
+
+ /**
+ * How many extra messages per edge (corrections) have been received.
+ */
+ unsigned long long total_nse_extra;
+
+ /**
+ * How many messages have been discarded.
+ */
+ unsigned long long total_discarded;
};
*/
static struct GNUNET_TIME_Relative wait_time;
+/**
+ * NSE interval.
+ */
+static struct GNUNET_TIME_Relative interval;
+
/**
* Task called to disconnect peers.
*/
static char *topology_file;
-static char *data_filename;
-
-static uint64_t clock_skew;
-
/**
* Check whether peers successfully shut down.
*/
struct NSEPeer *pos;
#if VERBOSE
- fprintf (stderr, "Ending test.\n");
+ FPRINTF (stderr, "%s", "Ending test.\n");
#endif
if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
if (pos->nse_handle != NULL)
GNUNET_NSE_disconnect (pos->nse_handle);
GNUNET_CONTAINER_DLL_remove (peer_head, peer_tail, pos);
+ if (GNUNET_SCHEDULER_NO_TASK != pos->stats_task)
+ {
+ GNUNET_SCHEDULER_cancel (pos->stats_task);
+ if (NULL != pos->stats)
+ GNUNET_STATISTICS_destroy(pos->stats, GNUNET_NO);
+ }
GNUNET_free (pos);
}
if (output_file != NULL)
{
- size = GNUNET_asprintf (&output_buffer,
- "%s %llu %llu %f %f %f\n",
- GNUNET_i2s (&peer->daemon->id),
- peers_running,
- timestamp.abs_value,
- GNUNET_NSE_log_estimate_to_n (estimate),
- estimate, std_dev);
+ size =
+ GNUNET_asprintf (&output_buffer, "%s %llu %llu %f %f %f\n",
+ GNUNET_i2s (&peer->daemon->id), peers_running,
+ timestamp.abs_value,
+ GNUNET_NSE_log_estimate_to_n (estimate), estimate,
+ std_dev);
if (size != GNUNET_DISK_file_write (output_file, output_buffer, size))
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
GNUNET_free (output_buffer);
}
else
- fprintf (stderr,
+ FPRINTF (stderr,
"Received network size estimate from peer %s. Size: %f std.dev. %f\n",
GNUNET_i2s (&peer->daemon->id), estimate, std_dev);
}
+/**
+ * Process core statistic values.
+ *
+ * @param cls closure
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+static int
+core_stats_iterator (void *cls, const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
+{
+ struct NSEPeer *peer = cls;
+ char *output_buffer;
+ size_t size;
+
+ if (output_file != NULL)
+ {
+ size =
+ GNUNET_asprintf (&output_buffer, "%s [%s] %s %llu\n",
+ GNUNET_i2s (&peer->daemon->id),
+ subsystem, name, value);
+ if (size != GNUNET_DISK_file_write (output_file, output_buffer, size))
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ GNUNET_free (output_buffer);
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s -> %s [%s]: %llu\n",
+ GNUNET_i2s (&peer->daemon->id), subsystem, name, value);
+
+ return GNUNET_OK;
+}
+
+/**
+ * Continuation called by "get_stats" function.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if statistics were
+ * successfully obtained, GNUNET_SYSERR if not.
+ */
+static void
+core_stats_cont (void *cls, int success);
+
+static void
+core_get_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct NSEPeer *peer = cls;
+
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ {
+ GNUNET_STATISTICS_destroy(peer->stats, GNUNET_NO);
+ peer->stats = NULL;
+ return;
+ }
+ else
+ {
+ GNUNET_STATISTICS_get(peer->stats, "core", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &core_stats_cont, &core_stats_iterator, peer);
+ GNUNET_STATISTICS_get(peer->stats, "transport", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL, &core_stats_iterator, peer);
+ GNUNET_STATISTICS_get(peer->stats, "nse", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL, &core_stats_iterator, peer);
+ }
+ peer->stats_task = GNUNET_SCHEDULER_NO_TASK;
+}
+
+/**
+ * Continuation called by "get_stats" function.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if statistics were
+ * successfully obtained, GNUNET_SYSERR if not.
+ */
+static void
+core_stats_cont (void *cls, int success)
+{
+ struct NSEPeer *peer = cls;
+ peer->stats_task = GNUNET_SCHEDULER_add_delayed (interval, &core_get_stats,
+ peer);
+}
+
+/**
+ *
+ */
static void
connect_nse_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
current_peer = GNUNET_malloc (sizeof (struct NSEPeer));
current_peer->daemon = GNUNET_TESTING_daemon_get (pg, i);
if (GNUNET_YES ==
- GNUNET_TESTING_daemon_running (GNUNET_TESTING_daemon_get (pg, i)))
+ GNUNET_TESTING_test_daemon_running (GNUNET_TESTING_daemon_get (pg, i)))
{
- current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg,
- &handle_estimate,
- current_peer);
+ current_peer->nse_handle =
+ GNUNET_NSE_connect (current_peer->daemon->cfg, &handle_estimate,
+ current_peer);
GNUNET_assert (current_peer->nse_handle != NULL);
}
+ current_peer->stats = GNUNET_STATISTICS_create("profiler", current_peer->daemon->cfg);
+ GNUNET_STATISTICS_get(current_peer->stats, "core", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &core_stats_cont, &core_stats_iterator, current_peer);
+ GNUNET_STATISTICS_get(current_peer->stats, "transport", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL, &core_stats_iterator, current_peer);
+ GNUNET_STATISTICS_get(current_peer->stats, "nse", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL, &core_stats_iterator, current_peer);
GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer);
}
}
{
/* Stats lookup successful, write out data */
buf = NULL;
- buf_len = GNUNET_asprintf (&buf,
- "TOTAL_NSE_BYTES: %u\n",
- stats_context->total_nse_bytes);
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_RECEIVED_MESSAGES_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_nse_received_messages);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_TRANSMITTED_MESSAGES_%d: %u\n",
+ stats_context->shutdown,
+ stats_context->total_nse_transmitted_messages);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_CROSS_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_nse_cross);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_EXTRA_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_nse_extra);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_DISCARDED_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_discarded);
if (buf_len > 0)
{
GNUNET_DISK_file_write (data_file, buf, buf_len);
}
GNUNET_free_non_null (buf);
+
}
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ if (GNUNET_YES == stats_context->shutdown)
+ {
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == shutdown_handle);
+ shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ }
+ else
+ {
+ GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
+ churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ }
GNUNET_free (stats_context);
}
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
static int
-statistics_iterator (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
+statistics_iterator (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const char *subsystem, const char *name, uint64_t value,
+ int is_persistent)
{
struct StatsContext *stats_context = cls;
- if ((0 == strstr (subsystem, "nse")) &&
- (0 == strstr (name, "# flood messages received")))
- stats_context->total_nse_bytes += value;
+ if (0 == strcmp (subsystem, "nse"))
+ {
+ if (0 == strcmp (name, "# flood messages received"))
+ {
+ stats_context->total_nse_received_messages += value;
+#if VERBOSE
+ if (data_file != NULL)
+ {
+ char *buf;
+ int buf_len;
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "%s %u RECEIVED\n", GNUNET_i2s(peer), value);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+ }
+#endif
+ }
+ if (0 == strcmp (name, "# flood messages transmitted"))
+ {
+ stats_context->total_nse_transmitted_messages += value;
+#if VERBOSE
+ if (data_file != NULL)
+ {
+ char *buf;
+ int buf_len;
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "%s %u TRANSMITTED\n",
+ GNUNET_i2s(peer), value);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+ }
+#endif
+ }
+ if (0 == strcmp (name, "# cross messages"))
+ {
+ stats_context->total_nse_cross += value;
+ }
+ if (0 == strcmp (name, "# extra messages"))
+ {
+ stats_context->total_nse_extra += value;
+ }
+ if (0 == strcmp (name, "# flood messages discarded (clock skew too large)"))
+ {
+ stats_context->total_discarded += value;
+ }
+ }
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnecting nse service of peers\n");
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- pos = peer_head;
while (NULL != (pos = peer_head))
{
if (pos->nse_handle != NULL)
pos->nse_handle = NULL;
}
GNUNET_CONTAINER_DLL_remove (peer_head, peer_tail, pos);
+ if (NULL != pos->stats)
+ GNUNET_STATISTICS_destroy(pos->stats, GNUNET_NO);
+ if (GNUNET_SCHEDULER_NO_TASK != pos->stats_task)
+ GNUNET_SCHEDULER_cancel (pos->stats_task);
GNUNET_free (pos);
}
GNUNET_asprintf (&buf, "round%llu", current_round);
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (testing_cfg,
- "nse-profiler",
- buf,
- &peers_next_round))
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "nse-profiler", buf,
+ &peers_next_round))
{
current_round++;
- GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
- churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ if (current_round == 1)
+ {
+ stats_context = GNUNET_malloc (sizeof (struct StatsContext));
+ stats_context->shutdown = GNUNET_NO;
+ GNUNET_TESTING_get_statistics (pg, &stats_finished_callback,
+ &statistics_iterator, stats_context);
+ }
+ else
+ {
+ GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
+ churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ }
}
else /* No more rounds, let's shut it down! */
{
stats_context = GNUNET_malloc (sizeof (struct StatsContext));
+ stats_context->shutdown = GNUNET_YES;
GNUNET_SCHEDULER_cancel (shutdown_handle);
shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_TESTING_get_statistics (pg,
- &stats_finished_callback,
+ GNUNET_TESTING_get_statistics (pg, &stats_finished_callback,
&statistics_iterator, stats_context);
}
GNUNET_free (buf);
static void
topology_output_callback (void *cls, const char *emsg)
{
- disconnect_task = GNUNET_SCHEDULER_add_delayed (wait_time,
- &disconnect_nse_peers, NULL);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_nse_peers, NULL);
GNUNET_SCHEDULER_add_now (&connect_nse_service, NULL);
}
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Round %llu, churn finished successfully.\n", current_round);
GNUNET_assert (disconnect_task == GNUNET_SCHEDULER_NO_TASK);
- GNUNET_asprintf (&temp_output_file,
- "%s_%llu.dot", topology_file, current_round);
- GNUNET_TESTING_peergroup_topology_to_file (pg,
- temp_output_file,
+ GNUNET_asprintf (&temp_output_file, "%s_%llu.dot", topology_file,
+ current_round);
+ GNUNET_TESTING_peergroup_topology_to_file (pg, temp_output_file,
&topology_output_callback, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Writing topology to file %s\n", temp_output_file);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Writing topology to file %s\n",
+ temp_output_file);
GNUNET_free (temp_output_file);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Round %llu, churn FAILED!!\n", current_round);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Round %llu, churn FAILED!!\n",
+ current_round);
GNUNET_SCHEDULER_cancel (shutdown_handle);
shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
/* Nothing to do... */
GNUNET_SCHEDULER_add_now (&connect_nse_service, NULL);
GNUNET_assert (disconnect_task == GNUNET_SCHEDULER_NO_TASK);
- disconnect_task = GNUNET_SCHEDULER_add_delayed (wait_time,
- &disconnect_nse_peers,
- NULL);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_nse_peers, NULL);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Round %lu, doing nothing!\n",
current_round);
}
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Round %llu, turning off %llu peers, turning on %llu peers!\n",
current_round,
- (peers_running > peers_next_round)
- ? peers_running - peers_next_round
- : 0,
- (peers_next_round > peers_running)
- ? peers_next_round - peers_running : 0);
+ (peers_running >
+ peers_next_round) ? peers_running - peers_next_round : 0,
+ (peers_next_round >
+ peers_running) ? peers_next_round - peers_running : 0);
GNUNET_TESTING_daemons_churn (pg, "nse",
- (peers_running > peers_next_round)
- ? peers_running - peers_next_round
- : 0,
- (peers_next_round > peers_running)
- ? peers_next_round - peers_running
- : 0, wait_time, &churn_callback, NULL);
+ (peers_running >
+ peers_next_round) ? peers_running -
+ peers_next_round : 0,
+ (peers_next_round >
+ peers_running) ? peers_next_round -
+ peers_running : 0, wait_time, &churn_callback,
+ NULL);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer Group started successfully, connecting to NSE service for each peer!\n");
#endif
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Have %u connections\n", total_connections);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n",
+ total_connections);
if (data_file != NULL)
{
buf = NULL;
GNUNET_free (buf);
}
peers_running = GNUNET_TESTING_daemons_running (pg);
- GNUNET_TESTING_daemons_start_service (pg,
- "nse",
- wait_time, &nse_started_cb, NULL);
+ GNUNET_TESTING_daemons_start_service (pg, "nse", wait_time, &nse_started_cb,
+ NULL);
}
* @param emsg error message (NULL on success)
*/
static void
-connect_cb (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- uint32_t distance,
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second, uint32_t distance,
const struct GNUNET_CONFIGURATION_Handle *first_cfg,
const struct GNUNET_CONFIGURATION_Handle *second_cfg,
struct GNUNET_TESTING_Daemon *first_daemon,
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *temp_str;
- unsigned long long temp_wait;
struct GNUNET_TESTING_Host *hosts;
+ char *data_filename;
ok = 1;
- testing_cfg = GNUNET_CONFIGURATION_create ();
+ //testing_cfg = GNUNET_CONFIGURATION_create ();
+ testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
- GNUNET_CONFIGURATION_set_value_string (testing_cfg,
- "testing", "use_progressbars", "YES");
+ GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+ "use_progressbars", "YES");
#endif
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg,
- "testing",
- "num_peers",
- &num_peers))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+ "num_peers", &num_peers))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Option TESTING:NUM_PEERS is required!\n");
return;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg,
- "nse-profiler",
- "wait_time",
- &temp_wait))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse-profiler",
+ "WAIT_TIME", &wait_time))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Option nse-profiler:wait_time is required!\n");
return;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg,
- "nse-profiler",
- "connection_limit",
- &connection_limit))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse",
+ "INTERVAL", &interval))
{
- connection_limit = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Option nse:interval is required!\n");
+ return;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (testing_cfg,
- "nse-profiler",
- "topology_output_file",
- &topology_file))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "nse-profiler",
+ "connection_limit",
+ &connection_limit))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option nse-profiler:topology_output_file is required!\n");
- return;
+ connection_limit = 0;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (testing_cfg,
- "nse-profiler",
- "data_output_file",
- &data_filename))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "nse-profiler",
+ "topology_output_file",
+ &topology_file))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option nse-profiler:data_output_file is required!\n");
+ "Option nse-profiler:topology_output_file is required!\n");
return;
}
- if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (testing_cfg,
- "nse-profiler",
- "skew_clock"))
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "nse-profiler",
+ "data_output_file",
+ &data_filename))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Setting our clock as skewed...\n");
- clock_skew = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
- GNUNET_TIME_UNIT_MINUTES.rel_value);
+ data_file =
+ GNUNET_DISK_file_open (data_filename,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_TRUNCATE |
+ 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);
}
-
- 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);
-
- wait_time =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
- if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (cfg,
- "nse-profiler",
- "output_file",
- &temp_str))
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "nse-profiler", "output_file",
+ &temp_str))
{
- output_file = GNUNET_DISK_file_open (temp_str, GNUNET_DISK_OPEN_READWRITE
- | GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
+ output_file =
+ GNUNET_DISK_file_open (temp_str,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
if (output_file == NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Failed to open %s for output!\n", temp_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
+ temp_str);
}
GNUNET_free_non_null (temp_str);
hosts = GNUNET_TESTING_hosts_load (testing_cfg);
- pg = GNUNET_TESTING_peergroup_start (testing_cfg,
- num_peers,
- TIMEOUT,
+ pg = GNUNET_TESTING_peergroup_start (testing_cfg, num_peers, TIMEOUT,
&connect_cb, &my_cb, NULL, hosts);
GNUNET_assert (pg != NULL);
shutdown_handle =
"WARNING",
#endif
NULL);
- GNUNET_PROGRAM_run (argc,
- argv, "nse-profiler",
+ GNUNET_PROGRAM_run (argc, argv, "nse-profiler",
gettext_noop
("Measure quality and performance of the NSE service."),
options, &run, NULL);
projects / oweals / gnunet.git / blobdiff