- set service working

- set profiler

4 files changed, 2 insertions, 202 deletions

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 914fbdef8..4b81baa59 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -16,8 +16,7 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-consensus \
- gnunet-consensus-start-peers
+ gnunet-consensus
 
 libexec_PROGRAMS = \
  gnunet-service-consensus
@@ -41,17 +40,6 @@ gnunet_consensus_LDADD = \
 gnunet_consensus_DEPENDENCIES = \
   libgnunetconsensus.la
 
-gnunet_consensus_start_peers_SOURCES = \
- gnunet-consensus-start-peers.c
-gnunet_consensus_start_peers_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la \
-  $(GN_LIBINTL)
-gnunet_consensus_start_peers_DEPENDENCIES = \
-  libgnunetconsensus.la
-
-
 gnunet_service_consensus_SOURCES = \
  gnunet-service-consensus.c
 gnunet_service_consensus_LDADD = \
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index a1dc40826..7690dc059 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -205,7 +205,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
   consensus->client = GNUNET_CLIENT_connect ("consensus", cfg);
   consensus->mq = GNUNET_MQ_queue_for_connection_client (consensus->client,
-                                                         mq_handlers, consensus);
+                                                         mq_handlers, NULL, consensus);
 
   GNUNET_assert (consensus->client != NULL);
 
diff --git a/src/consensus/gnunet-consensus-start-peers.c b/src/consensus/gnunet-consensus-start-peers.c
deleted file mode 100644
index 05ba05691..000000000
--- a/src/consensus/gnunet-consensus-start-peers.c
+++ /dev/null
@@ -1,186 +0,0 @@
-
-/*
-      This file is part of GNUnet
-      (C) 2012 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
-      by the Free Software Foundation; either version 2, or (at your
-      option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
-
-      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.
- */
-
-/**
- * @file consensus/gnunet-consensus-start-peers.c
- * @brief Starts peers with testebed on localhost,
- *        prints their configuration files and waits for ^C.
- * @author Florian Dold
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
-
-
-static char *config_template_file;
-static unsigned int num_peers_requested = 2;
-static struct GNUNET_TESTBED_Peer **peers;
-
-
-/**
- * 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
-peer_info_cb (void *cb_cls,
-              struct GNUNET_TESTBED_Operation
-              *op,
-              const struct
-              GNUNET_TESTBED_PeerInformation
-              *pinfo,
-              const char *emsg)
-{
-  GNUNET_assert (NULL == emsg);
-  if (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY)
-  {
-    struct GNUNET_CRYPTO_HashAsciiEncoded enc;
-    GNUNET_CRYPTO_hash_to_enc (&pinfo->result.id->hashPubKey, &enc);
-    printf("peer %td identity:\n", ((struct GNUNET_TESTBED_Peer **) cb_cls) - &peers[0]);
-    printf("%s\n", (char *)&enc);
-  }
-  else if (pinfo->pit == GNUNET_TESTBED_PIT_CONFIGURATION)
-  {
-    char *tmpfilename;
-    if (NULL == (tmpfilename = GNUNET_DISK_mktemp ("gnunet-consensus")))
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-    if (GNUNET_SYSERR == 
-        GNUNET_CONFIGURATION_write (pinfo->result.cfg,
-                                    tmpfilename))
-    {
-      GNUNET_break (0);
-      return;
-    }
-    printf("peer %td config file:\n", ((struct GNUNET_TESTBED_Peer **) cb_cls) - &peers[0]);
-    printf("%s\n", tmpfilename);
-  }
-  else
-  {
-    GNUNET_assert (0);
-  }
-}
-
-
-
-/**
- * Signature of the event handler function called by the
- * respective event controller.
- *
- * @param cls closure
- * @param event information about the event
- */
-static void
-controller_cb(void *cls,
-              const struct GNUNET_TESTBED_EventInformation *event)
-{
-  GNUNET_assert (0);
-}
-
-
-
-
-/**
- * Signature of a main function for a testcase.
- *
- * @param cls closure
- * @param num_peers number of peers in 'peers'
- * @param started_peers handle to peers being 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 **started_peers,
-             unsigned int links_succeeded,
-             unsigned int links_failed)
-{
-  int i;
-
-  printf("started %d peers\n", num_peers);
-  peers = started_peers;
-
-  for (i = 0; i < num_peers; i++)
-  {
-    GNUNET_TESTBED_peer_get_information (peers[i],
-                                         GNUNET_TESTBED_PIT_IDENTITY,
-                                         peer_info_cb,
-                                         &peers[i]);
-    GNUNET_TESTBED_peer_get_information (peers[i],
-                                         GNUNET_TESTBED_PIT_CONFIGURATION,
-                                         peer_info_cb,
-                                         &peers[i]);
-  }
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *config)
-{
-  if (NULL == config_template_file)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "no template file specified\n");
-    return;
-  }
-
-  (void) GNUNET_TESTBED_test_run ("gnunet-consensus-start-peers",
-                                  config_template_file,
-                                  num_peers_requested,
-                                  0,
-                                  controller_cb,
-                                  NULL,
-                                  test_master,
-                                  NULL);
-}
-
-
-int
-main (int argc, char **argv)
-{
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-      { 't', "config-template", "TEMPLATE",
-        gettext_noop ("start peers with the given template configuration"),
-        GNUNET_YES, &GNUNET_GETOPT_set_string, &config_template_file },
-      { 'n', "num-peers", "NUM",
-        gettext_noop ("number of peers to start"),
-        GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers_requested },
-      GNUNET_GETOPT_OPTION_END
-   };
-
-  /* run without scheduler, as test_run already does this */
-  GNUNET_PROGRAM_run2 (argc, argv, "gnunet-consensus-start-peers",
-                      "help",
-                      options, &run, NULL, GNUNET_YES);
-  return 0;
-}
-
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 9cde0e46b..1245dcca4 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -266,8 +266,6 @@ have_exp_subround_finished (const struct ConsensusSession *session)
 }
 
 
-
-
 /**
  * Destroy a session, free all resources associated with it.
  *