-align core message, do not run psycstore here
[oweals/gnunet.git] / src / regex / gnunet-regex-profiler.c
index fea2886a2a14cf5d3a7bca04edb86ce88df81db9..638f1a1a43bd2cc1d78eb39d013df1e82fa756d9 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2011 - 2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
 /**
  * @file regex/gnunet-regex-profiler.c
- * @brief Stream API testing between 2 peers using testing API
- * @author Bart Polot
- * @author Max Szengel
+ * @brief Regex profiler for testing distributed regex use.
+ * @author Bartlomiej Polot
+ * @author Maximilian Szengel
+ *
  */
 
 #include <string.h>
 
 #include "platform.h"
+#include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_mesh_service.h"
-#include "gnunet_stream_lib.h"
+#include "regex_internal_lib.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_dht_service.h"
 #include "gnunet_testbed_service.h"
 
+#define FIND_TIMEOUT \
+        GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
 
-#define NUM_HOSTS 2
+/**
+ * DLL of operations
+ */
+struct DLLOperation
+{
+  /**
+   * The testbed operation handle
+   */
+  struct GNUNET_TESTBED_Operation *op;
 
-#define PEER_PER_HOST 1
+  /**
+   * Closure
+   */
+  void *cls;
+
+  /**
+   * The next pointer for DLL
+   */
+  struct DLLOperation *next;
+
+  /**
+   * The prev pointer for DLL
+   */
+  struct DLLOperation *prev;
+};
 
-#define TOTAL_PEERS (NUM_HOSTS * PEER_PER_HOST)
 
 /**
- * Shorthand for Relative time in seconds
+ * Available states during profiling
  */
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
+enum State
+{
+  /**
+   * Initial state
+   */
+  STATE_INIT = 0,
+
+  /**
+   * Starting slaves
+   */
+  STATE_SLAVES_STARTING,
+
+  /**
+   * Creating peers
+   */
+  STATE_PEERS_CREATING,
+
+  /**
+   * Starting peers
+   */
+  STATE_PEERS_STARTING,
+
+  /**
+   * Linking peers
+   */
+  STATE_PEERS_LINKING,
+
+  /**
+   * Matching strings against announced regexes
+   */
+  STATE_SEARCH_REGEX,
+
+  /**
+   * Destroying peers; we can do this as the controller takes care of stopping a
+   * peer if it is running
+   */
+  STATE_PEERS_DESTROYING
+};
+
 
 /**
- * Structure for holding peer's sockets and IO Handles
+ * Peer handles.
  */
-struct PeerData
+struct RegexPeer
 {
   /**
-   * Handle to testbed peer
+   * Peer id.
    */
-  struct GNUNET_TESTBED_Peer *peer;
+  unsigned int id;
 
   /**
-   * Peer's stream socket
+   * Peer configuration handle.
    */
-  struct GNUNET_STREAM_Socket *socket;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
-   * Peer's io write handle
+   * The actual testbed peer handle.
    */
-  struct GNUNET_STREAM_IOWriteHandle *io_write_handle;
+  struct GNUNET_TESTBED_Peer *peer_handle;
 
   /**
-   * Peer's io read handle
+   * Peer's search string.
    */
-  struct GNUNET_STREAM_IOReadHandle *io_read_handle;
+  const char *search_str;
 
   /**
-   * Peer's shutdown handle
+   * Set to GNUNET_YES if the peer successfully matched the above
+   * search string. GNUNET_NO if the string could not be matched
+   * during the profiler run. GNUNET_SYSERR if the string matching
+   * timed out. Undefined if search_str is NULL
    */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
+  int search_str_matched;
 
   /**
-   * The service connect operation to stream
+   * Peer's DHT handle.
    */
-  struct GNUNET_TESTBED_Operation *op;
+  struct GNUNET_DHT_Handle *dht_handle;
 
   /**
-   * Our Peer id
+   * Handle to a running regex search.
    */
-  struct GNUNET_PeerIdentity our_id;
+   struct REGEX_INTERNAL_Search *search_handle;
 
   /**
-   * Bytes the peer has written
+   * Testbed operation handle for DHT.
    */
-  unsigned int bytes_wrote;
+  struct GNUNET_TESTBED_Operation *op_handle;
 
   /**
-   * Byte the peer has read
+   * Peers's statistics handle.
    */
-  unsigned int bytes_read;
-};
+  struct GNUNET_STATISTICS_Handle *stats_handle;
 
+  /**
+   * The starting time of a profiling step.
+   */
+  struct GNUNET_TIME_Absolute prof_start_time;
 
-/**
- * Different states in test setup
- */
-enum SetupState
-{
   /**
-   * The initial state
+   * Operation timeout
    */
-  INIT,
+  GNUNET_SCHEDULER_TaskIdentifier timeout;
 
   /**
-   * Connecting to slave controller
+   * Deamon start
    */
-  LINKING,
+  struct GNUNET_TESTBED_Operation *daemon_op;
+};
 
-  CREATING_PEER,
+/**
+ * Set when shutting down to avoid making more queries.
+ */
+static int in_shutdown;
 
-  STARTING_PEER
-};
+/**
+ * The array of peers; we fill this as the peers are given to us by the testbed
+ */
+static struct RegexPeer *peers;
 
+/**
+ * Host registration handle
+ */
+static struct GNUNET_TESTBED_HostRegistrationHandle *reg_handle;
 
 /**
- * Event Mask for operation callbacks
+ * Handle to the master controller process
  */
-uint64_t event_mask;
+static struct GNUNET_TESTBED_ControllerProc *mc_proc;
 
 /**
- * Testbed operation handle
+ * Handle to the master controller
  */
-static struct GNUNET_TESTBED_Operation *op[NUM_HOSTS];
+static struct GNUNET_TESTBED_Controller *mc;
 
-static enum SetupState state[NUM_HOSTS];
+/**
+ * Handle to global configuration
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
+/**
+ * Abort task identifier
+ */
 static GNUNET_SCHEDULER_TaskIdentifier abort_task;
 
 /**
- * Global test result
+ * Shutdown task identifier
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+/**
+ * Host registration task identifier
+ */
+static GNUNET_SCHEDULER_TaskIdentifier register_hosts_task;
+
+/**
+ * Global event mask for all testbed events
+ */
+static uint64_t event_mask;
+
+/**
+ * The starting time of a profiling step
+ */
+static struct GNUNET_TIME_Absolute prof_start_time;
+
+/**
+ * Duration profiling step has taken
+ */
+static struct GNUNET_TIME_Relative prof_time;
+
+/**
+ * Number of peers to be started by the profiler
+ */
+static unsigned int num_peers;
+
+/**
+ * Global testing status
  */
 static int result;
 
 /**
- * Hosts successfully registered
+ * current state of profiling
+ */
+enum State state;
+
+/**
+ * Folder where policy files are stored.
  */
-static unsigned int host_registered;
+static char * policy_dir;
 
 /**
- * Peers successfully started
+ * File with hostnames where to execute the test.
  */
-static unsigned int peers_started;
+static char *hosts_file;
 
 /**
- * The master controller host
+ * File with the strings to look for.
  */
-struct GNUNET_TESTBED_Host *master_host;
+static char *strings_file;
 
 /**
- * The master controller process
+ * Search strings (num_peers of them).
  */
-static struct GNUNET_TESTBED_ControllerProc *master_proc;
+static char **search_strings;
 
 /**
- * Handle to master controller
+ * How many searches are we going to start in parallel
  */
-static struct GNUNET_TESTBED_Controller *master_ctrl;
+static long long unsigned int init_parallel_searches;
 
 /**
- * Slave host IP addresses
+ * How many searches are running in parallel
  */
+static unsigned int parallel_searches;
 
-static char *slave_ips[NUM_HOSTS] = { "192.168.1.33", "192.168.1.34" };
+/**
+ * Number of strings found in the published regexes.
+ */
+static unsigned int strings_found;
 
 /**
- * The slave hosts
+ * Index of peer to start next announce/search.
  */
-struct GNUNET_TESTBED_Host *slave_hosts[NUM_HOSTS];
+static unsigned int next_search;
 
 /**
- * Slave host registration handles
+ * Search timeout task identifier.
  */
-static struct GNUNET_TESTBED_HostRegistrationHandle *rh;
+static GNUNET_SCHEDULER_TaskIdentifier search_timeout_task;
 
 /**
- * The peers
+ * Search timeout in seconds.
  */
-struct GNUNET_TESTBED_Peer *peers[TOTAL_PEERS];
+static struct GNUNET_TIME_Relative search_timeout_time = { 60000 };
 
 /**
- * Handle to global configuration
+ * File to log statistics to.
  */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_DISK_FileHandle *data_file;
 
+/**
+ * Filename to log statistics to.
+ */
+static char *data_filename;
 
 /**
- * Completion callback for shutdown
+ * Prefix used for regex announcing. We need to prefix the search
+ * strings with it, in order to find something.
+ */
+static char * regex_prefix;
+
+/**
+ * What's the maximum regex reannounce period.
+ */
+static struct GNUNET_TIME_Relative reannounce_period_max;
+
+
+/******************************************************************************/
+/******************************  DECLARATIONS  ********************************/
+/******************************************************************************/
+
+/**
+ * DHT connect callback.
+ *
+ * @param cls internal peer id.
+ * @param op operation handle.
+ * @param ca_result connect adapter result.
+ * @param emsg error message.
+ */
+static void
+dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
+                void *ca_result, const char *emsg);
+
+/**
+ * DHT connect adapter.
+ *
+ * @param cls not used.
+ * @param cfg configuration handle.
  *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR)
+ * @return
  */
-// static void
-// shutdown_completion (void *cls,
-//                      int operation)
-// {
-//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-//   GNUNET_SCHEDULER_add_now (&do_close, cls);
-// }
+static void *
+dht_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
+/**
+ * Adapter function called to destroy a connection to
+ * the DHT service
+ *
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
+static void
+dht_da (void *cls, void *op_result);
+
 
 /**
- * Shutdown sockets gracefully
+ * Function called by testbed once we are connected to stats
+ * service. Get the statistics for the services of interest.
+ *
+ * @param cls the 'struct RegexPeer' for which we connected to stats
+ * @param op connect operation handle
+ * @param ca_result handle to stats service
+ * @param emsg error message on failure
  */
-// static void
-// do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-// {
-//   result = GNUNET_OK;
-//   peer1.shutdown_handle = GNUNET_STREAM_shutdown (peer1.socket, SHUT_RDWR,
-//                                                   &shutdown_completion, cls);
-// }
+static void
+stats_connect_cb (void *cls,
+                  struct GNUNET_TESTBED_Operation *op,
+                  void *ca_result,
+                  const char *emsg);
 
 
 /**
- * Something went wrong and timed out. Kill everything and set error flag
+ * Start announcing the next regex in the DHT.
+ *
+ * @param cls Index of the next peer in the peers array.
+ * @param tc TaskContext.
  */
 static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/******************************************************************************/
+/********************************  SHUTDOWN  **********************************/
+/******************************************************************************/
+
+
+/**
+ * Shutdown nicely
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  result = GNUNET_SYSERR;
-  abort_task = 0;
+  struct RegexPeer *peer;
+  unsigned int peer_cnt;
+  unsigned int search_str_cnt;
+  char output_buffer[512];
+  size_t size;
+
+  shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+    GNUNET_SCHEDULER_cancel (abort_task);
+  if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
+    GNUNET_SCHEDULER_cancel (register_hosts_task);
+
+  for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
+  {
+    peer = &peers[peer_cnt];
+
+    if (GNUNET_YES != peer->search_str_matched && NULL != data_file)
+    {
+      prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time);
+      size =
+        GNUNET_snprintf (output_buffer,
+                         sizeof (output_buffer),
+                         "%p Search string not found: %s (%d)\n"
+                         "%p On peer: %u (%p)\n"
+                         "%p After: %s\n",
+                         peer, peer->search_str, peer->search_str_matched,
+                         peer, peer->id, peer,
+                         peer,
+                         GNUNET_STRINGS_relative_time_to_string (prof_time,
+                                                                 GNUNET_NO));
+      if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+    }
+
+    if (NULL != peers[peer_cnt].op_handle)
+      GNUNET_TESTBED_operation_done (peers[peer_cnt].op_handle);
+  }
+
+  if (NULL != data_file)
+    GNUNET_DISK_file_close (data_file);
+
+  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);
+
+  if (NULL != reg_handle)
+    GNUNET_TESTBED_cancel_registration (reg_handle);
+
+  if (NULL != mc)
+    GNUNET_TESTBED_controller_disconnect (mc);
+  if (NULL != mc_proc)
+    GNUNET_TESTBED_controller_stop (mc_proc);
+  if (NULL != cfg)
+    GNUNET_CONFIGURATION_destroy (cfg);
+
+  GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
 }
 
 
 /**
- * Adapter function called to destroy a connection to
- * a service.
+ * abort task to run on test timed out
  *
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
+ * @param cls NULL
+ * @param tc the task context
  */
-// static void
-// stream_da (void *cls, void *op_result)
-// {
-//   struct GNUNET_STREAM_ListenSocket *lsocket;
-//   struct GNUNET_STREAM_Socket *socket;
-//
-//   if (&peer1 == cls)
-//   {
-//     lsocket = op_result;
-//     GNUNET_STREAM_listen_close (lsocket);
-//     GNUNET_TESTBED_operation_done (peer2.op);
-//     return;
-//   }
-//   if (&peer2 == cls)
-//   {
-//     socket = op_result;
-//     GNUNET_STREAM_close (socket);
-//     GNUNET_SCHEDULER_shutdown (); /* Exit point of the test */
-//     return;
-//   }
-//   GNUNET_assert (0);
-// }
+static void
+do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  unsigned long i = (unsigned long) cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting from line %lu...\n", i);
+  abort_task = GNUNET_SCHEDULER_NO_TASK;
+  result = GNUNET_SYSERR;
+  if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+  shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+}
 
 
+/******************************************************************************/
+/*********************  STATISTICS SERVICE CONNECTIONS  ***********************/
+/******************************************************************************/
+
 /**
  * Adapter function called to establish a connection to
- * a service.
+ * statistics service.
  *
  * @param cls closure
  * @param cfg configuration of the peer to connect to; will be available until
@@ -272,426 +501,974 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *          from GNUNET_TESTBED_service_connect()
  * @return service handle to return in 'op_result', NULL on error
  */
-// static void *
-// stream_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-// {
-//   struct GNUNET_STREAM_ListenSocket *lsocket;
-//
-//   switch (setup_state)
-//   {
-//   case PEER1_STREAM_CONNECT:
-//     lsocket = GNUNET_STREAM_listen (cfg, 10, &stream_listen_cb, NULL,
-//                                     GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-//                                     &stream_connect, GNUNET_STREAM_OPTION_END);
-//     return lsocket;
-//   case PEER2_STREAM_CONNECT:
-//     peer2.socket = GNUNET_STREAM_open (cfg, &peer1.our_id, 10, &stream_open_cb,
-//                                        &peer2, GNUNET_STREAM_OPTION_END);
-//     return peer2.socket;
-//   default:
-//     GNUNET_assert (0);
-//   }
-// }
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-// static void
-// stream_connect (void)
-// {
-//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream listen open successful\n");
-//   peer2.op = GNUNET_TESTBED_service_connect (&peer2, peer2.peer, "stream",
-//                                              NULL, NULL,
-//                                              stream_ca, stream_da, &peer2);
-//   setup_state = PEER2_STREAM_CONNECT;
-// }
-
-
-/**
- * Callback to be called when the requested peer information is available
- *
- * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
- */
-// static void
-// peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
-//              const struct GNUNET_TESTBED_PeerInformation *pinfo,
-//              const char *emsg)
-// {
-//   GNUNET_assert (NULL == emsg);
-//   GNUNET_assert (op == op_);
-//   switch (setup_state)
-//     {
-//     case PEER1_GET_IDENTITY:
-//       memcpy (&peer1.our_id, pinfo->result.id,
-//               sizeof (struct GNUNET_PeerIdentity));
-//       GNUNET_TESTBED_operation_done (op);
-//       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 1 id: %s\n", GNUNET_i2s
-//                   (&peer1.our_id));
-//       op = GNUNET_TESTBED_peer_get_information (peer2.peer,
-//                                                 GNUNET_TESTBED_PIT_IDENTITY,
-//                                                 &peerinfo_cb, NULL);
-//       setup_state = PEER2_GET_IDENTITY;
-//       break;
-//     case PEER2_GET_IDENTITY:
-//       memcpy (&peer2.our_id, pinfo->result.id,
-//               sizeof (struct GNUNET_PeerIdentity));
-//       GNUNET_TESTBED_operation_done (op);
-//       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 2 id: %s\n", GNUNET_i2s
-//                   (&peer2.our_id));
-//       peer1.op = GNUNET_TESTBED_service_connect (&peer1, peer1.peer, "stream",
-//                                                  NULL, NULL, stream_ca,
-//                                                  stream_da, &peer1);
-//       setup_state = PEER1_STREAM_CONNECT;
-//       break;
-//     default:
-//       GNUNET_assert (0);
-//     }
-// }
-
-
-/**
- * Controller event callback
+static void *
+stats_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  return GNUNET_STATISTICS_create ("<driver>", cfg);
+}
+
+
+/**
+ * Adapter function called to destroy a connection to
+ * statistics service.
  *
- * @param cls NULL
- * @param event the controller event
- */
-// static void
-// controller_event_cb (void *cls,
-//                      const struct GNUNET_TESTBED_EventInformation *event)
-// {
-//   switch (event->type)
-//   {
-//   case GNUNET_TESTBED_ET_CONNECT:
-//     GNUNET_assert (INIT == setup_state);
-//     GNUNET_TESTBED_operation_done (op);
-//     /* Get the peer identity and configuration of peers */
-//     op = GNUNET_TESTBED_peer_get_information (peer1.peer,
-//                                               GNUNET_TESTBED_PIT_IDENTITY,
-//                                               &peerinfo_cb, NULL);
-//     setup_state = PEER1_GET_IDENTITY;
-//     break;
-//   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-//     switch (setup_state)
-//     {
-//     case PEER1_STREAM_CONNECT:
-//     case PEER2_STREAM_CONNECT:
-//       GNUNET_assert (NULL == event->details.operation_finished.emsg);
-//       break;
-//     default:
-//       GNUNET_assert (0);
-//     }
-//     break;
-//   default:
-//     GNUNET_assert (0);
-//   }
-// }
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
+static void
+stats_da (void *cls, void *op_result)
+{
+  struct RegexPeer *peer = cls;
+
+  GNUNET_assert (op_result == peer->stats_handle);
+
+  GNUNET_STATISTICS_destroy (peer->stats_handle, GNUNET_NO);
+  peer->stats_handle = NULL;
+}
 
 
 /**
- * Signature of a main function for a testcase.
+ * Process statistic values. Write all values to global 'data_file', if present.
  *
  * @param cls closure
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
- */
-// static void
-// test_master (void *cls, unsigned int num_peers,
-//              struct GNUNET_TESTBED_Peer **peers)
-// {
-//   GNUNET_assert (NULL != peers);
-//   GNUNET_assert (NULL != peers[0]);
-//   GNUNET_assert (NULL != peers[1]);
-//   peer1.peer = peers[0];
-//   peer2.peer = peers[1];
-//   op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer, peer1.peer);
-//   setup_state = INIT;
-//   abort_task =
-//     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-//                                   (GNUNET_TIME_UNIT_SECONDS, 40), &do_abort,
-//                                   NULL);
-// }
-
-/**
- * Functions of this signature are called when a peer has been successfully
- * started or stopped.
- *
- * @param cls the closure from GNUNET_TESTBED_peer_start/stop()
- * @param emsg NULL on success; otherwise an error description
+ * @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
+stats_iterator (void *cls, const char *subsystem, const char *name,
+                uint64_t value, int is_persistent)
+{
+  struct RegexPeer *peer = cls;
+  char output_buffer[512];
+  size_t size;
+
+  if (NULL == data_file)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "%p -> %s [%s]: %llu\n",
+                peer, subsystem, name, value);
+    return GNUNET_OK;
+  }
+  size =
+    GNUNET_snprintf (output_buffer,
+                     sizeof (output_buffer),
+                     "%p [%s] %llu %s\n",
+                     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");
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Stats callback. Finish the stats testbed operation and when all stats have
+ * been iterated, shutdown the profiler.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if statistics were
+ *        successfully obtained, GNUNET_SYSERR if not.
  */
 static void
-peer_start_cb (void *cls, const char *emsg)
+stats_cb (void *cls,
+          int success)
 {
-  long i = (long) cls;
+  static unsigned int peer_cnt;
+  struct RegexPeer *peer = cls;
+
+  if (GNUNET_OK != success)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Getting statistics for peer %u failed!\n",
+                peer->id);
+    return;
+  }
+
+  GNUNET_assert (NULL != peer->op_handle);
+
+  GNUNET_TESTBED_operation_done (peer->op_handle);
+  peer->op_handle = NULL;
 
-  GNUNET_TESTBED_operation_done (op[i]);
-  peers_started++;
-  // FIXME create and start rest of PEERS_PER_HOST
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %u peer(s) started\n", peers_started);
+  peer_cnt++;
+  peer = &peers[peer_cnt];
 
-  if (TOTAL_PEERS == peers_started)
+  if (peer_cnt == num_peers)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ok\n");
+    struct GNUNET_TIME_Relative delay = { 100 };
+    shutdown_task = GNUNET_SCHEDULER_add_delayed (delay, &do_shutdown, NULL);
+    result = GNUNET_OK;
+  }
+  else
+  {
+    peer->op_handle =
+      GNUNET_TESTBED_service_connect (NULL,
+                                      peer->peer_handle,
+                                      "statistics",
+                                      &stats_connect_cb,
+                                      peer,
+                                      &stats_ca,
+                                      &stats_da,
+                                      peer);
   }
 }
 
 
 /**
- * Functions of this signature are called when a peer has been successfully
- * created
+ * Function called by testbed once we are connected to stats
+ * service. Get the statistics for the services of interest.
  *
- * @param cls the closure from GNUNET_TESTBED_peer_create()
- * @param peer the handle for the created peer; NULL on any error during
- *          creation
- * @param emsg NULL if peer is not NULL; else MAY contain the error description
+ * @param cls the 'struct RegexPeer' for which we connected to stats
+ * @param op connect operation handle
+ * @param ca_result handle to stats service
+ * @param emsg error message on failure
  */
 static void
-peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
+stats_connect_cb (void *cls,
+                  struct GNUNET_TESTBED_Operation *op,
+                  void *ca_result,
+                  const char *emsg)
 {
-  long i = (long) cls;
-  long peer_id;
-
-//   GNUNET_TESTBED_operation_done(op[i]);
-  peer_id = i;                  // FIXME  A * i + B
-  peers[peer_id] = peer;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Peer %i created\n", peer_id);
-  op[i] = GNUNET_TESTBED_peer_start (NULL, peer, peer_start_cb, (void *) i);
+  struct RegexPeer *peer = cls;
+
+  if (NULL == ca_result || NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to connect to statistics service on peer %u: %s\n",
+                peer->id, emsg);
+
+    peer->stats_handle = NULL;
+    return;
+  }
+
+  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))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not get statistics of peer %u!\n", peer->id);
+  }
 }
 
 
 /**
- * Signature of the event handler function called by the
- * respective event controller.
+ * Task to collect all statistics from all peers, will shutdown the
+ * profiler, when done.
  *
- * @param cls closure
- * @param event information about the event
+ * @param cls NULL
+ * @param tc the task context
  */
 static void
-controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
+do_collect_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  long i;
+  struct RegexPeer *peer = &peers[0];
+
+  GNUNET_assert (NULL != peer->peer_handle);
+
+  peer->op_handle =
+    GNUNET_TESTBED_service_connect (NULL,
+                                    peer->peer_handle,
+                                    "statistics",
+                                    &stats_connect_cb,
+                                    peer,
+                                    &stats_ca,
+                                    &stats_da,
+                                    peer);
+}
 
-  switch (event->type)
+
+/******************************************************************************/
+/************************   REGEX FIND CONNECTIONS   **************************/
+/******************************************************************************/
+
+
+/**
+ * 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);
+
+
+/**
+ * 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 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.
+ * @param put_path Path of the put request.
+ * @param put_path_length Length of the put_path.
+ */
+static void
+regex_found_handler (void *cls,
+                     const struct GNUNET_PeerIdentity *id,
+                     const struct GNUNET_PeerIdentity *get_path,
+                     unsigned int get_path_length,
+                     const struct GNUNET_PeerIdentity *put_path,
+                     unsigned int put_path_length)
+{
+  struct RegexPeer *peer = cls;
+  char output_buffer[512];
+  size_t size;
+
+  if (GNUNET_YES == peer->search_str_matched)
   {
-  case GNUNET_TESTBED_ET_PEER_START:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Peer started\n");
-    /* event->details.peer_start.peer; */
-    /* event->details.peer_start.host; */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "String %s on peer %u already matched!\n",
+                peer->search_str, peer->id);
+    return;
+  }
 
-    break;
-  case GNUNET_TESTBED_ET_PEER_STOP:
-  case GNUNET_TESTBED_ET_CONNECT:
-    break;
-  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-    if (NULL != event->details.operation_finished.emsg)
+  strings_found++;
+  parallel_searches--;
+
+  if (GNUNET_SCHEDULER_NO_TASK != peer->timeout)
+  {
+    GNUNET_SCHEDULER_cancel (peer->timeout);
+    peer->timeout = GNUNET_SCHEDULER_NO_TASK;
+    if (GNUNET_NO == in_shutdown)
+      GNUNET_SCHEDULER_add_now (&announce_next_regex, NULL);
+  }
+
+  if (NULL == id)
+  {
+    // FIXME not possible right now
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "String matching timed out for string %s on peer %u (%i/%i)\n",
+                peer->search_str, peer->id, strings_found, num_peers);
+    peer->search_str_matched = GNUNET_SYSERR;
+  }
+  else
+  {
+    prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time);
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "String %s found on peer %u after %s (%i/%i) (%u||)\n",
+                peer->search_str, peer->id,
+                GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO),
+                strings_found, num_peers, parallel_searches);
+
+    peer->search_str_matched = GNUNET_YES;
+
+    if (NULL != data_file)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testbed error: %s\n",
-                  event->details.operation_finished.emsg);
-      GNUNET_assert (0);
+      size =
+        GNUNET_snprintf (output_buffer,
+                         sizeof (output_buffer),
+                         "%p Peer: %u\n"
+                         "%p Search string: %s\n"
+                         "%p Search duration: %s\n\n",
+                         peer, peer->id,
+                         peer, peer->search_str,
+                         peer,
+                         GNUNET_STRINGS_relative_time_to_string (prof_time,
+                                                                 GNUNET_NO));
+
+      if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
     }
-    GNUNET_TESTBED_operation_done (event->details.operation_finished.operation);
-    //GNUNET_assert (NULL != event->details.operation_finished.op_cls);
-    i = (long) event->details.operation_finished.op_cls;
-    op[i] = NULL;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  Operation %u finished\n", i);
-    switch (state[i])
+  }
+
+  GNUNET_TESTBED_operation_done (peer->op_handle);
+  peer->op_handle = NULL;
+
+  if (strings_found == num_peers)
+  {
+    prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "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)
     {
-    case INIT:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  Init: %u\n", i);
-      break;
-    case LINKING:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "   Linked host %i\n", i);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "   Creating peer...\n");
-
-      state[i] = CREATING_PEER;
-      op[i] =
-          GNUNET_TESTBED_peer_create (master_ctrl, slave_hosts[i], cfg,
-                                      peer_create_cb, (void *) i);
-      break;
-    case CREATING_PEER:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  Peer create\n");
-      break;
-    default:
-      GNUNET_break (0);
+      GNUNET_SCHEDULER_cancel (search_timeout_task);
+      search_timeout_task = GNUNET_SCHEDULER_NO_TASK;
     }
-    break;
-  default:
-    GNUNET_break (0);
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Collecting stats and shutting down.\n");
+    GNUNET_SCHEDULER_add_now (&do_collect_stats, NULL);
   }
 }
 
+
 /**
- * Callback which will be called to after a host registration succeeded or failed
+ * Connect by string timeout task. This will cancel the profiler after the
+ * specified timeout 'search_timeout'.
  *
- * @param cls the host which has been registered
- * @param emsg the error message; NULL if host registration is successful
+ * @param cls NULL
+ * @param tc the task context
  */
 static void
-registration_cont (void *cls, const char *emsg)
+search_timed_out (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
 {
-  if (NULL != emsg)
+  unsigned int i;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Finding matches to all strings did not succeed after %s.\n",
+              GNUNET_STRINGS_relative_time_to_string (search_timeout_time,
+                                                      GNUNET_NO));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Found %i of %i strings\n", strings_found, num_peers);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Search timed out after %s."
+              "Collecting stats and shutting down.\n", 
+              GNUNET_STRINGS_relative_time_to_string (search_timeout_time,
+                                                      GNUNET_NO));
+
+  in_shutdown = GNUNET_YES;
+  for (i = 0; i < num_peers; i++)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", emsg);
-    GNUNET_assert (0);
-  }
-  state[host_registered] = LINKING;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Linking host %u\n", host_registered);
-  op[host_registered] =
-      GNUNET_TESTBED_controller_link ((void *) (long) host_registered,
-                                      master_ctrl, slave_hosts[host_registered],
-                                      NULL, cfg, GNUNET_YES);
-  host_registered++;
-  if (NUM_HOSTS != host_registered)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Registering host %u\n",
-                host_registered);
-    rh = GNUNET_TESTBED_register_host (master_ctrl,
-                                       slave_hosts[host_registered],
-                                       &registration_cont, NULL);
-    return;
+    if (NULL != peers[i].op_handle)
+    {
+      GNUNET_TESTBED_operation_done (peers[i].op_handle);
+      peers[i].op_handle = NULL;
+    }
   }
+  GNUNET_SCHEDULER_add_now (&do_collect_stats, NULL);
 }
 
+
 /**
- * Callback to signal successfull startup of the controller process
+ * Search timed out. It might still complete in the future,
+ * but we should start another one.
  *
- * @param cls the closure from GNUNET_TESTBED_controller_start()
- * @param cfg the configuration with which the controller has been started;
- *          NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
- *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
+ * @param cls Index of the next peer in the peers array.
+ * @param tc TaskContext.
  */
 static void
-status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config,
-           int status)
+find_timed_out (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  unsigned int i;
+  struct RegexPeer *p = cls;
 
-  if (NULL == config || GNUNET_OK != status)
+  p->timeout = GNUNET_SCHEDULER_NO_TASK;
+
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+    return;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Searching for string \"%s\" on peer %d timed out.\n",
+              p->search_str,
+              p->id);
+  if (GNUNET_NO == in_shutdown)
+    GNUNET_SCHEDULER_add_now (&announce_next_regex, NULL);
+}
+
+
+/**
+ * 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)
+{
+  unsigned int search_peer = (unsigned int) (long) cls;
+
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
+      search_peer >= num_peers ||
+      GNUNET_YES == in_shutdown)
     return;
 
-  event_mask = 0;
-  event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
-  event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);
-  event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
-  event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to master controller\n");
-  master_ctrl =
-      GNUNET_TESTBED_controller_connect (config, master_host, event_mask,
-                                         &controller_cb, NULL);
-  GNUNET_assert (NULL != master_ctrl);
-
-  for (i = 0; i < NUM_HOSTS; i++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Creating host %u\n", i);
-    slave_hosts[i] = GNUNET_TESTBED_host_create (slave_ips[i], NULL, 0);
-    GNUNET_assert (NULL != slave_hosts[i]);
-  }
-  host_registered = 0;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Registering host %u\n",
-              host_registered);
-  rh = GNUNET_TESTBED_register_host (master_ctrl, slave_hosts[0],
-                                     &registration_cont, NULL);
-  GNUNET_assert (NULL != rh);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Searching for string \"%s\" on peer %d (%u||)\n",
+              peers[search_peer].search_str,
+              search_peer,
+              parallel_searches);
+
+  peers[search_peer].op_handle =
+    GNUNET_TESTBED_service_connect (NULL,
+                                    peers[search_peer].peer_handle,
+                                    "dht",
+                                    &dht_connect_cb,
+                                    &peers[search_peer],
+                                    &dht_ca,
+                                    &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]);
 }
 
 
+
+
 /**
- * Main run function.
+ * Callback called when testbed has started the daemon we asked for.
  *
  * @param cls NULL
- * @param args arguments passed to GNUNET_PROGRAM_run
- * @param cfgfile the path to configuration file
- * @param cfg the configuration file handle
+ * @param op the operation handle
+ * @param emsg NULL on success; otherwise an error description
  */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *config)
+daemon_started (void *cls, struct GNUNET_TESTBED_Operation *op,
+                const char *emsg)
 {
-  master_host = GNUNET_TESTBED_host_create ("192.168.1.33", NULL, 0);
-  GNUNET_assert (NULL != master_host);
-  cfg = GNUNET_CONFIGURATION_dup (config);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting master controller\n");
-  master_proc =
-      GNUNET_TESTBED_controller_start ("192.168.1.33", master_host, cfg,
-                                       status_cb, NULL);
-  abort_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_MINUTES, 60), &do_abort,
-                                    NULL);
+  struct RegexPeer *peer = (struct RegexPeer *) cls;
+  unsigned long search_peer;
+  unsigned int i;
+
+  GNUNET_TESTBED_operation_done (peer->daemon_op);
+  peer->daemon_op = NULL;
+  if (NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to start/stop daemon at peer %u: %s\n", peer->id, emsg);
+    GNUNET_abort ();
+  }
+
+  /* Find a peer to look for a string matching the regex announced */
+  search_peer = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                          num_peers);
+  for (i = 0; peers[search_peer].search_str != NULL; i++)
+  {
+    search_peer = (search_peer + 1) % num_peers;
+    if (i > num_peers)
+      GNUNET_abort (); /* 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;
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                  reannounce_period_max,
+                                  2),
+                                &find_string,
+                                (void *) search_peer);
 }
 
+
 /**
- * Main function
+ * Task to start the daemons on each peer so that the regexes are announced
+ * into the DHT.
+ *
+ * @param cls NULL
+ * @param tc the task context
  */
-int
-main (int argc, char **argv)
+static void
+do_announce (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  int ret;
-  int test_hosts;
   unsigned int i;
 
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  char *const argv2[] = { "gnunet-regex-profiler",
-    "-c", "regex_profiler_test.conf",
-    NULL
-  };
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting announce.\n");
+
+  for (i = 0; i < init_parallel_searches; i++)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "  scheduling announce %u\n",
+                i);
+    (void) GNUNET_SCHEDULER_add_now (&announce_next_regex, NULL);
+  }
+}
+
 
-  test_hosts = GNUNET_OK;
-  for (i = 0; i < NUM_HOSTS; i++)
-  {
-    char *const remote_args[] = {
-      "ssh", "-o", "BatchMode=yes", slave_ips[i],
-      "gnunet-helper-testbed --help > /dev/null", NULL
-    };
-    struct GNUNET_OS_Process *auxp;
-    enum GNUNET_OS_ProcessStatusType type;
-    unsigned long code;
-
-    fprintf (stderr, "Testing host %i\n", i);
-    auxp =
-        GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL,
-                                     NULL, "ssh", remote_args);
-    GNUNET_assert (NULL != auxp);
-    do
+/**
+ * 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)
+{
+  struct RegexPeer *peer;
+
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  if (next_search >= num_peers)
+  {
+    if (strings_found != num_peers)
     {
-      ret = GNUNET_OS_process_status (auxp, &type, &code);
-      GNUNET_assert (GNUNET_SYSERR != ret);
-      (void) usleep (300);
+      struct GNUNET_TIME_Relative new_delay;
+      if (GNUNET_SCHEDULER_NO_TASK != 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);
     }
-    while (GNUNET_NO == ret);
-    (void) GNUNET_OS_process_wait (auxp);
-    GNUNET_OS_process_destroy (auxp);
-    if (0 != code)
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting daemon %u\n", next_search);
+  peer = &peers[next_search];
+  peer->daemon_op = 
+  GNUNET_TESTBED_peer_manage_service (NULL,
+                                      peer->peer_handle,
+                                      "regexprofiler",
+                                      &daemon_started,
+                                      peer,
+                                      1);
+  next_search++;
+  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
+ * peer and then try to match the search string of this peer.
+ *
+ * @param cls internal peer id.
+ * @param op operation handle.
+ * @param ca_result connect adapter result.
+ * @param emsg error message.
+ */
+static void
+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 (NULL != peer->dht_handle);
+  GNUNET_assert (peer->op_handle == op);
+  GNUNET_assert (peer->dht_handle == ca_result);
+
+  peer->search_str_matched = GNUNET_NO;
+  peer->search_handle = REGEX_INTERNAL_search (peer->dht_handle,
+                                             peer->search_str,
+                                             &regex_found_handler, peer,
+                                             NULL);
+  peer->prof_start_time = GNUNET_TIME_absolute_get ();
+}
+
+
+/**
+ * DHT connect adapter. Opens a connection to the dht service.
+ *
+ * @param cls Closure (peer).
+ * @param cfg Configuration handle.
+ *
+ * @return
+ */
+static void *
+dht_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct RegexPeer *peer = cls;
+
+  peer->dht_handle = GNUNET_DHT_connect (cfg, 32);
+
+  return peer->dht_handle;
+}
+
+
+/**
+ * Adapter function called to destroy a connection to the dht service.
+ *
+ * @param cls Closure (peer).
+ * @param op_result Service handle returned from the connect adapter.
+ */
+static void
+dht_da (void *cls, void *op_result)
+{
+  struct RegexPeer *peer = (struct RegexPeer *) cls;
+
+  GNUNET_assert (peer->dht_handle == op_result);
+
+  if (NULL != peer->search_handle)
+  {
+    REGEX_INTERNAL_search_cancel (peer->search_handle);
+    peer->search_handle = NULL;
+  }
+
+  if (NULL != peer->dht_handle)
+  {
+    GNUNET_DHT_disconnect (peer->dht_handle);
+    peer->dht_handle = NULL;
+  }
+}
+
+
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls NULL
+ * @param num_peers_ number of peers in 'peers'
+ * @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 
+test_master (void *cls,
+             unsigned int num_peers_,
+             struct GNUNET_TESTBED_Peer **testbed_peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
+{
+  unsigned int i;
+
+  GNUNET_assert (num_peers_ == num_peers);
+
+  prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Testbed started in %s\n",
+              GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
+
+  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+  {
+    GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  for (i = 0; i < num_peers; i++)
+  {
+    peers[i].peer_handle = testbed_peers[i];
+  }
+  if (GNUNET_NO ==
+      GNUNET_CONFIGURATION_get_value_yesno (cfg, "DHT", "DISABLE_TRY_CONNECT"))
+  {
+    struct GNUNET_TIME_Relative settle_time;
+
+    settle_time =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+                                     10 * num_peers);
+    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);
+  }
+  else
+  {
+    GNUNET_SCHEDULER_add_now (&do_announce, NULL);
+  }
+  search_timeout_task =
+      GNUNET_SCHEDULER_add_delayed (search_timeout_time, &search_timed_out, NULL);
+}
+
+/**
+ * Function that will be called whenever something in the testbed changes.
+ *
+ * @param cls closure, NULL
+ * @param event information on what is happening
+ */
+static void
+master_controller_cb (void *cls, 
+                      const struct GNUNET_TESTBED_EventInformation *event)
+{
+  switch (event->type)
+  {
+  case GNUNET_TESTBED_ET_CONNECT:
+    printf(".");
+    break;
+  case GNUNET_TESTBED_ET_PEER_START:
+    printf("#");
+    break;
+  default:
+    break;
+  }
+  fflush(stdout);
+}
+
+
+/******************************************************************************/
+/***************************  TESTBED PEER SETUP  *****************************/
+/******************************************************************************/
+
+
+/**
+ * Load search strings from given filename. One search string per line.
+ *
+ * @param filename filename of the file containing the search strings.
+ * @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.
+ */
+static int
+load_search_strings (const char *filename, char ***strings, unsigned int limit)
+{
+  char *data;
+  char *buf;
+  uint64_t filesize;
+  unsigned int offset;
+  int str_cnt;
+  unsigned int i;
+
+  if (NULL == filename)
+  {
+    return GNUNET_SYSERR;
+  }
+
+  if (GNUNET_YES != GNUNET_DISK_file_test (filename))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "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))
+    filesize = 0;
+  if (0 == filesize)
+  {
+    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))
+  {
+    GNUNET_free (data);
+    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)
+  {
+    offset++;
+    if (((data[offset] == '\n')) && (buf != &data[offset]))
     {
-      fprintf (stderr,
-               "Unable to run the test as this system is not configured "
-               "to use password less SSH logins to host %s.\n", slave_ips[i]);
-      test_hosts = GNUNET_SYSERR;
+      data[offset] = '\0';
+      str_cnt++;
+      buf = &data[offset + 1];
     }
+    else if ((data[offset] == '\n') || (data[offset] == '\0'))
+      buf = &data[offset + 1];
   }
-  if (test_hosts != GNUNET_OK)
+  *strings = GNUNET_malloc (sizeof (char *) * str_cnt);
+  offset = 0;
+  for (i = 0; i < str_cnt; i++)
   {
-    fprintf (stderr, "Some hosts have failed the ssh check. Exiting.\n");
-    return 1;
+    GNUNET_asprintf (&(*strings)[i], "%s%s", regex_prefix, &data[offset]);
+    offset += strlen (&data[offset]) + 1;
   }
-  fprintf (stderr, "START.\n");
+  GNUNET_free (data);
+  return str_cnt;
+}
 
-  result = GNUNET_SYSERR;
 
-  ret =
-      GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
-                          "test_regex_big", "nohelp", options, &run, NULL);
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param config configuration
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *config)
+{
+  unsigned int nsearchstrs;
+  unsigned int i;
+  struct GNUNET_TIME_Relative abort_time;
+
+  in_shutdown = GNUNET_NO;
 
-  fprintf (stderr, "END.\n");
+  /* Check config */
+  if (NULL == config)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No configuration file given. Exiting\n"));
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    return;
+  }
+  cfg = GNUNET_CONFIGURATION_dup (config);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER",
+                                             "REGEX_PREFIX",
+                                             &regex_prefix))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Configuration option \"regex_prefix\" missing. Exiting\n"));
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    return;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg, "REGEXPROFILER",
+                                             "PARALLEL_SEARCHES",
+                                             &init_parallel_searches))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Configuration option \"PARALLEL_SEARCHES\" missing."
+                " Using default (%d)\n", 10);
+    init_parallel_searches = 10;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "REGEXPROFILER",
+                                           "REANNOUNCE_PERIOD_MAX",
+                                           &reannounce_period_max))
+  {
+    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);
+  }
 
-  if (GNUNET_SYSERR == result || GNUNET_OK != ret)
+  /* Check arguments */
+  if (NULL == policy_dir)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No policy directory specified on command line. Exiting.\n"));
+    return;
+  }
+  if (GNUNET_YES != GNUNET_DISK_directory_test (policy_dir, GNUNET_YES))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Specified policies directory does not exist. Exiting.\n"));
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    return;
+  }
+  if (-1 == (num_peers = GNUNET_DISK_directory_scan (policy_dir, NULL, NULL)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No files found in `%s'\n"),
+                policy_dir);
+    return;
+  }
+  GNUNET_CONFIGURATION_set_value_string (cfg, "REGEXPROFILER",
+                                         "POLICY_DIR", policy_dir);
+  if (GNUNET_YES != GNUNET_DISK_file_test (strings_file))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No search strings file given. Exiting.\n"));
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    return;
+  }
+  nsearchstrs = load_search_strings (strings_file,
+                                     &search_strings,
+                                     num_peers);
+  if (num_peers != nsearchstrs)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "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);
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    return;
+  }
+  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);
+    return;
+  }
+  for (i = 0; i < num_peers; i++)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "search string: %s\n",
+                search_strings[i]);
+
+  /* Check logfile */
+  if ( (NULL != data_filename) &&
+       (NULL == (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))) )
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "open",
+                              data_filename);
+    return;
+  }
+
+  /* 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 * 20);
+  GNUNET_CONFIGURATION_set_value_number (cfg,
+                                         "DHT", "FORCE_NSE",
+                                         (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);
+//   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
+  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
+//   event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);
+  prof_start_time = GNUNET_TIME_absolute_get ();
+  GNUNET_TESTBED_run (hosts_file,
+                      cfg,
+                      num_peers,
+                      event_mask,
+                      &master_controller_cb,
+                      NULL,     /* master_controller_cb cls */
+                      &test_master,
+                      NULL);    /* test_master cls */
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED",
+                                           "SETUP_TIMEOUT",
+                                           &abort_time))
+  {
+    abort_time =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15);
+  }
+  abort_time = GNUNET_TIME_relative_add (abort_time, GNUNET_TIME_UNIT_MINUTES);
+  abort_task =
+      GNUNET_SCHEDULER_add_delayed (abort_time,
+                                    &do_abort,
+                                    (void*) __LINE__);
+}
+
+
+/**
+ * Main function.
+ *
+ * @param argc argument count
+ * @param argv argument values
+ * @return 0 on success
+ */
+int
+main (int argc, char *const *argv)
+{
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'o', "output-file", "FILENAME",
+     gettext_noop ("name of the file for writing statistics"),
+     GNUNET_YES, &GNUNET_GETOPT_set_string, &data_filename},
+    {'t', "matching-timeout", "TIMEOUT",
+      gettext_noop ("wait TIMEOUT before ending the experiment"),
+      GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &search_timeout_time},
+    {'p', "policy-dir", "DIRECTORY",
+      gettext_noop ("directory with policy files"),
+      GNUNET_YES, &GNUNET_GETOPT_set_filename, &policy_dir},
+    {'s', "strings-file", "FILENAME",
+      gettext_noop ("name of file with input strings"),
+      GNUNET_YES, &GNUNET_GETOPT_set_filename, &strings_file},
+    {'H', "hosts-file", "FILENAME",
+      gettext_noop ("name of file with hosts' names"),
+      GNUNET_YES, &GNUNET_GETOPT_set_filename, &hosts_file},
+    GNUNET_GETOPT_OPTION_END
+  };
+  int ret;
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+  result = GNUNET_SYSERR;
+  ret =
+      GNUNET_PROGRAM_run (argc, argv,
+                          "gnunet-regex-profiler",
+                          _("Profiler for regex"),
+                          options, &run, NULL);
+  if (GNUNET_OK != ret)
+    return ret;
+  if (GNUNET_OK != result)
     return 1;
   return 0;
 }