/*
This file is part of GNUnet.
- (C) 2011 - 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 - 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "platform.h"
#include "gnunet_applications.h"
#include "gnunet_util_lib.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
#include "gnunet_arm_service.h"
#include "gnunet_dht_service.h"
#include "gnunet_testbed_service.h"
/**
* Handle to a running regex search.
*/
- struct GNUNET_REGEX_search_handle *search_handle;
+ struct REGEX_INTERNAL_Search *search_handle;
/**
* Testbed operation handle for DHT.
/**
* Operation timeout
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout;
+ struct GNUNET_SCHEDULER_Task * timeout;
/**
* Deamon start
/**
* Abort task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-
-/**
- * Shutdown task identifier
- */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
/**
* Host registration task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier register_hosts_task;
+static struct GNUNET_SCHEDULER_Task * register_hosts_task;
/**
* Global event mask for all testbed events
/**
* Search timeout task identifier.
*/
-static GNUNET_SCHEDULER_TaskIdentifier search_timeout_task;
+static struct GNUNET_SCHEDULER_Task * search_timeout_task;
/**
* Search timeout in seconds.
* Start announcing the next regex in the DHT.
*
* @param cls Index of the next peer in the peers array.
- * @param tc TaskContext.
*/
static void
-announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+announce_next_regex (void *cls);
/******************************************************************************/
* Shutdown nicely
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
struct RegexPeer *peer;
unsigned int peer_cnt;
char output_buffer[512];
size_t size;
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
+ {
GNUNET_SCHEDULER_cancel (abort_task);
- if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
+ abort_task = NULL;
+ }
+ if (NULL != register_hosts_task)
+ {
GNUNET_SCHEDULER_cancel (register_hosts_task);
-
+ register_hosts_task = NULL;
+ }
for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
{
peer = &peers[peer_cnt];
}
if (NULL != data_file)
+ {
GNUNET_DISK_file_close (data_file);
-
+ data_file = NULL;
+ }
for (search_str_cnt = 0;
search_str_cnt < num_peers && NULL != search_strings;
search_str_cnt++)
GNUNET_free_non_null (search_strings[search_str_cnt]);
}
GNUNET_free_non_null (search_strings);
+ search_strings = NULL;
if (NULL != reg_handle)
+ {
GNUNET_TESTBED_cancel_registration (reg_handle);
-
+ reg_handle = NULL;
+ }
if (NULL != mc)
+ {
GNUNET_TESTBED_controller_disconnect (mc);
+ mc = NULL;
+ }
if (NULL != mc_proc)
+ {
GNUNET_TESTBED_controller_stop (mc_proc);
+ mc_proc = NULL;
+ }
if (NULL != cfg)
+ {
GNUNET_CONFIGURATION_destroy (cfg);
-
- GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
+ cfg = NULL;
+ }
}
* abort task to run on test timed out
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
{
unsigned long i = (unsigned long) cls;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting from line %lu...\n", i);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Aborting from line %lu...\n", i);
+ abort_task = NULL;
result = GNUNET_SYSERR;
- if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
- GNUNET_SCHEDULER_cancel (shutdown_task);
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
* @return service handle to return in 'op_result', NULL on error
*/
static void *
-stats_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+stats_ca (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
return GNUNET_STATISTICS_create ("<driver>", cfg);
}
* @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
+ * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
*/
static int
-stats_iterator (void *cls, const char *subsystem, const char *name,
+stats_iterator (void *cls,
+ const char *subsystem,
+ const char *name,
uint64_t value, int is_persistent)
{
struct RegexPeer *peer = cls;
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%p -> %s [%s]: %llu\n",
- peer, subsystem, name, value);
+ peer,
+ subsystem,
+ name,
+ (unsigned long long) value);
return GNUNET_OK;
}
size =
peer,
subsystem, value, name);
if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Unable to write to file!\n");
return GNUNET_OK;
}
peer_cnt++;
peer = &peers[peer_cnt];
+ fprintf (stderr, "s");
if (peer_cnt == num_peers)
{
- struct GNUNET_TIME_Relative delay = { 100 };
- shutdown_task = GNUNET_SCHEDULER_add_delayed (delay, &do_shutdown, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "\nCollecting stats finished. Shutting down.\n");
+ GNUNET_SCHEDULER_shutdown ();
+ result = GNUNET_OK;
}
else
{
peer->stats_handle = ca_result;
if (NULL == GNUNET_STATISTICS_get (peer->stats_handle, NULL, NULL,
- GNUNET_TIME_UNIT_FOREVER_REL,
&stats_cb,
&stats_iterator, peer))
{
* profiler, when done.
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_collect_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_collect_stats (void *cls)
{
struct RegexPeer *peer = &peers[0];
* Start searching for the next string in the DHT.
*
* @param cls Index of the next peer in the peers array.
- * @param tc TaskContext.
*/
static void
-find_string (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+find_string (void *cls);
/**
* Method called when we've found a peer that announced a regex
* that matches our search string. Now get the statistics.
*
- * @param cls Closure provided in GNUNET_REGEX_search.
+ * @param cls Closure provided in REGEX_INTERNAL_search.
* @param id Peer providing a regex that matches the string.
* @param get_path Path of the get request.
* @param get_path_length Lenght of get_path.
if (GNUNET_YES == peer->search_str_matched)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"String %s on peer %u already matched!\n",
peer->search_str, peer->id);
return;
strings_found++;
parallel_searches--;
- if (GNUNET_SCHEDULER_NO_TASK != peer->timeout)
+ if (NULL != peer->timeout)
{
GNUNET_SCHEDULER_cancel (peer->timeout);
- peer->timeout = GNUNET_SCHEDULER_NO_TASK;
+ peer->timeout = NULL;
if (GNUNET_NO == in_shutdown)
GNUNET_SCHEDULER_add_now (&announce_next_regex, NULL);
}
"All strings successfully matched in %s\n",
GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
- if (GNUNET_SCHEDULER_NO_TASK != search_timeout_task)
+ if (NULL != search_timeout_task)
+ {
GNUNET_SCHEDULER_cancel (search_timeout_task);
+ search_timeout_task = NULL;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Collecting stats and shutting down.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Collecting stats.\n");
GNUNET_SCHEDULER_add_now (&do_collect_stats, NULL);
}
}
* specified timeout 'search_timeout'.
*
* @param cls NULL
- * @param tc the task context
*/
static void
-search_timed_out (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+search_timed_out (void *cls)
{
unsigned int i;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Search timed out after %s."
- "Collecting stats and shutting down.\n",
+ "Collecting stats and shutting down.\n",
GNUNET_STRINGS_relative_time_to_string (search_timeout_time,
GNUNET_NO));
* but we should start another one.
*
* @param cls Index of the next peer in the peers array.
- * @param tc TaskContext.
*/
static void
-find_timed_out (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+find_timed_out (void *cls)
{
struct RegexPeer *p = cls;
- p->timeout = GNUNET_SCHEDULER_NO_TASK;
-
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
+ p->timeout = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Searching for string \"%s\" on peer %d timed out.\n",
p->search_str,
* Start searching for a string in the DHT.
*
* @param cls Index of the next peer in the peers array.
- * @param tc TaskContext.
*/
static void
-find_string (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+find_string (void *cls)
{
unsigned int search_peer = (unsigned int) (long) cls;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
- search_peer >= num_peers ||
- GNUNET_YES == in_shutdown)
+ if ( (search_peer >= num_peers) ||
+ (GNUNET_YES == in_shutdown) )
return;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
&dht_da,
&peers[search_peer]);
GNUNET_assert (NULL != peers[search_peer].op_handle);
- peers[search_peer].timeout = GNUNET_SCHEDULER_add_delayed (FIND_TIMEOUT,
- &find_timed_out,
- &peers[search_peer]);
+ peers[search_peer].timeout
+ = GNUNET_SCHEDULER_add_delayed (FIND_TIMEOUT,
+ &find_timed_out,
+ &peers[search_peer]);
}
-
-
/**
* Callback called when testbed has started the daemon we asked for.
*
* @param emsg NULL on success; otherwise an error description
*/
static void
-daemon_started (void *cls, struct GNUNET_TESTBED_Operation *op,
+daemon_started (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Failed to start/stop daemon at peer %u: %s\n", peer->id, emsg);
- GNUNET_abort ();
+ GNUNET_assert (0);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Deamon %u started successfully\n", peer->id);
}
/* Find a peer to look for a string matching the regex announced */
{
search_peer = (search_peer + 1) % num_peers;
if (i > num_peers)
- GNUNET_abort (); /* we ran out of peers, must be a bug */
+ GNUNET_assert (0); /* we ran out of peers, must be a bug */
}
peers[search_peer].search_str = search_strings[peer->id];
peers[search_peer].search_str_matched = GNUNET_NO;
* @param tc the task context
*/
static void
-do_announce (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_announce (void *cls)
{
unsigned int i;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting announce.\n");
-
+ if (GNUNET_YES == in_shutdown)
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Starting announce.\n");
for (i = 0; i < init_parallel_searches; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
* Start announcing the next regex in the DHT.
*
* @param cls Closure (unused).
- * @param tc TaskContext.
*/
static void
-announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+announce_next_regex (void *cls)
{
struct RegexPeer *peer;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
- next_search >= num_peers)
+ if (GNUNET_YES == in_shutdown)
+ return;
+ if (next_search >= num_peers)
+ {
+ if (strings_found != num_peers)
+ {
+ struct GNUNET_TIME_Relative new_delay;
+ if (NULL != search_timeout_task)
+ GNUNET_SCHEDULER_cancel (search_timeout_task);
+ new_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15);
+ search_timeout_task = GNUNET_SCHEDULER_add_delayed (new_delay,
+ &search_timed_out,
+ NULL);
+ }
return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting daemon %u\n", next_search);
peer = &peers[next_search];
- peer->daemon_op =
+ peer->daemon_op =
GNUNET_TESTBED_peer_manage_service (NULL,
peer->peer_handle,
"regexprofiler",
parallel_searches++;
}
+
/**
* DHT connect callback. Called when we are connected to the dht service for
* the peer in 'cls'. If successfull we connect to the stats service of this
* @param emsg error message.
*/
static void
-dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
- void *ca_result, const char *emsg)
+dht_connect_cb (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
if (NULL != emsg || NULL == op || NULL == ca_result)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DHT connect failed: %s\n", emsg);
- GNUNET_abort ();
+ GNUNET_assert (0);
}
GNUNET_assert (NULL != peer->dht_handle);
GNUNET_assert (peer->dht_handle == ca_result);
peer->search_str_matched = GNUNET_NO;
- peer->search_handle = GNUNET_REGEX_search (peer->dht_handle,
+ peer->search_handle = REGEX_INTERNAL_search (peer->dht_handle,
peer->search_str,
®ex_found_handler, peer,
NULL);
if (NULL != peer->search_handle)
{
- GNUNET_REGEX_search_cancel (peer->search_handle);
+ REGEX_INTERNAL_search_cancel (peer->search_handle);
peer->search_handle = NULL;
}
* Signature of a main function for a testcase.
*
* @param cls NULL
+ * @param h the run handle
* @param num_peers_ number of peers in 'peers'
- * @param peers handle to peers run in the testbed. NULL upon timeout (see
+ * @param testbed_peers handle to peers run in the testbed. NULL upon timeout (see
* GNUNET_TESTBED_test_run()).
* @param links_succeeded the number of overlay link connection attempts that
* succeeded
* @param links_failed the number of overlay link connection attempts that
* failed
*/
-static void
+static void
test_master (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers_,
struct GNUNET_TESTBED_Peer **testbed_peers,
unsigned int links_succeeded,
"Testbed started in %s\n",
GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
{
GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task = NULL;
}
for (i = 0; i < num_peers; i++)
settle_time =
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
10 * num_peers);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Waiting for DHT for %s to settle new connections.\n\n",
GNUNET_STRINGS_relative_time_to_string(settle_time, GNUNET_NO));
GNUNET_SCHEDULER_add_delayed (settle_time, &do_announce, NULL);
* @param event information on what is happening
*/
static void
-master_controller_cb (void *cls,
+master_controller_cb (void *cls,
const struct GNUNET_TESTBED_EventInformation *event)
{
switch (event->type)
* @param strings set of strings loaded from file. Caller needs to free this
* if number returned is greater than zero.
* @param limit upper limit on the number of strings read from the file
- * @return number of strings found in the file. GNUNET_SYSERR on error.
+ * @return number of strings found in the file. #GNUNET_SYSERR on error.
*/
static int
-load_search_strings (const char *filename, char ***strings, unsigned int limit)
+load_search_strings (const char *filename,
+ char ***strings,
+ unsigned int limit)
{
char *data;
char *buf;
"Could not find search strings file %s\n", filename);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != GNUNET_DISK_file_size (filename, &filesize, GNUNET_YES, GNUNET_YES))
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_size (filename,
+ &filesize,
+ GNUNET_YES,
+ GNUNET_YES))
filesize = 0;
if (0 == filesize)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Search strings file %s is empty.\n", filename);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Search strings file %s is empty.\n",
+ filename);
return GNUNET_SYSERR;
}
- data = GNUNET_malloc (filesize);
- if (filesize != GNUNET_DISK_fn_read (filename, data, filesize))
+ data = GNUNET_malloc (filesize + 1);
+ if (filesize != GNUNET_DISK_fn_read (filename,
+ data,
+ filesize))
{
GNUNET_free (data);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read search strings file %s.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Could not read search strings file %s.\n",
filename);
return GNUNET_SYSERR;
}
buf = data;
offset = 0;
str_cnt = 0;
- while (offset < (filesize - 1) && str_cnt < limit)
+ while ( (offset < (filesize - 1)) && (str_cnt < limit) )
{
offset++;
- if (((data[offset] == '\n')) && (buf != &data[offset]))
+ if ( ((data[offset] == '\n')) &&
+ (buf != &data[offset]) )
{
data[offset] = '\0';
str_cnt++;
buf = &data[offset + 1];
}
- else if ((data[offset] == '\n') || (data[offset] == '\0'))
+ else if ( (data[offset] == '\n') ||
+ (data[offset] == '\0') )
buf = &data[offset + 1];
}
*strings = GNUNET_malloc (sizeof (char *) * str_cnt);
offset = 0;
for (i = 0; i < str_cnt; i++)
{
- GNUNET_asprintf (&(*strings)[i], "%s%s", regex_prefix, &data[offset]);
+ GNUNET_asprintf (&(*strings)[i],
+ "%s%s",
+ regex_prefix,
+ &data[offset]);
offset += strlen (&data[offset]) + 1;
}
GNUNET_free (data);
* @param config configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
unsigned int nsearchstrs;
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("No configuration file given. Exiting\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
cfg = GNUNET_CONFIGURATION_dup (config);
"REGEX_PREFIX",
®ex_prefix))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Configuration option \"regex_prefix\" missing. Exiting\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "regexprofiler",
+ "regex_prefix");
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
if (GNUNET_OK !=
"REANNOUNCE_PERIOD_MAX",
&reannounce_period_max))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"reannounce_period_max not given. Using 10 minutes.\n");
reannounce_period_max =
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10);
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Specified policies directory does not exist. Exiting.\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- if (-1 == (num_peers = GNUNET_DISK_directory_scan (policy_dir, NULL, NULL)))
+ if (0 >= (int) (num_peers = GNUNET_DISK_directory_scan (policy_dir, NULL, NULL)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("No files found in `%s'\n"),
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("No search strings file given. Exiting.\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
nsearchstrs = load_search_strings (strings_file,
if (num_peers != nsearchstrs)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Error loading search strings."
- "Given file does not contain enough strings. Exiting.\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ "Error loading search strings.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "File (%s) does not contain enough strings (%u/%u).\n",
+ strings_file, nsearchstrs, num_peers);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- if (0 >= num_peers || NULL == search_strings)
+ if ( (0 == num_peers) || (NULL == search_strings))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Error loading search strings. Exiting.\n"));
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
for (i = 0; i < num_peers; i++)
/* Initialize peers */
peers = GNUNET_malloc (sizeof (struct RegexPeer) * num_peers);
for (i = 0; i < num_peers; i++)
- {
peers[i].id = i;
- }
GNUNET_CONFIGURATION_set_value_number (cfg,
"TESTBED", "OVERLAY_RANDOM_LINKS",
- num_peers * 10);
+ num_peers * 20);
GNUNET_CONFIGURATION_set_value_number (cfg,
"DHT", "FORCE_NSE",
- (long long unsigned) log2 (num_peers));
+ (long long unsigned)
+ (log (num_peers) / log (2.0)));
event_mask = 0LL;
/* For feedback about the start process activate these and pass master_cb */
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
NULL); /* test_master cls */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED",
- "SETUP_TIME",
+ "SETUP_TIMEOUT",
&abort_time))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "SETUP_TIMEOUT not given. Using 15 minutes.\n");
abort_time =
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15);
}
GNUNET_SCHEDULER_add_delayed (abort_time,
&do_abort,
(void*) __LINE__);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "setup_timeout: %s\n",
+ GNUNET_STRINGS_relative_time_to_string (abort_time, GNUNET_YES));
}