[GNUnet-SVN] r34294 - gnunet/src/sensor

[gnunet]

Author: otarabai
Date: 2014-09-15 18:00:53 +0200 (Mon, 15 Sep 2014)
New Revision: 34294

Added:
   gnunet/src/sensor/perf_pow_sign.c
Modified:
   gnunet/src/sensor/
   gnunet/src/sensor/Makefile.am
   gnunet/src/sensor/sensor_util_lib_crypto.c
Log:
sensor: pow benchmarking


Index: gnunet/src/sensor
===================================================================
--- gnunet/src/sensor   2014-09-15 15:00:36 UTC (rev 34293)
+++ gnunet/src/sensor   2014-09-15 16:00:53 UTC (rev 34294)

Property changes on: gnunet/src/sensor
___________________________________________________________________
Modified: svn:ignore
## -8,3 +8,4 ##
 test_gnunet-service-sensor_reporting
 test_pow_sign
 gnunet-sensor-profiler
+perf-pow-sign
Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am       2014-09-15 15:00:36 UTC (rev 34293)
+++ gnunet/src/sensor/Makefile.am       2014-09-15 16:00:53 UTC (rev 34294)
@@ -18,9 +18,12 @@
 endif
 
 bin_PROGRAMS = \
- gnunet-sensor \
- gnunet-sensor-profiler 
+ gnunet-sensor 
 
+noinst_PROGRAMS = \
+ gnunet-sensor-profiler \
+ perf-pow-sign
+
 libexec_PROGRAMS = \
  gnunet-service-sensor
 
@@ -118,6 +121,13 @@
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/transport/libgnunettransport.la
 
+perf_pow_sign_SOURCES = \
+  perf_pow_sign.c
+perf_pow_sign_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  libgnunetsensorutil.la
+
 pkgsensordir = sensors
 
 install-data-local:

Added: gnunet/src/sensor/perf_pow_sign.c
===================================================================
--- gnunet/src/sensor/perf_pow_sign.c                           (rev 0)
+++ gnunet/src/sensor/perf_pow_sign.c   2014-09-15 16:00:53 UTC (rev 34294)
@@ -0,0 +1,261 @@
+  /*
+   * This file is part of GNUnet.
+   * (C)
+   *
+   * 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 3, 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 sensor/perf_pow_sign.c
+ * @brief Print the average time required to generate pow for each matching 
bits
+ */
+#include <inttypes.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_sensor_util_lib.h"
+#include "gnunet_testbed_service.h"
+#include "gnunet_signatures.h"
+
+/**
+ * Number of peers to start for the test
+ */
+#define NUM_PEERS 1
+
+/**
+ * Size of the message exchanged
+ */
+#define MSG_SIZE 1024
+
+/**
+ * How many matching bits to start with
+ */
+#define MATCHING_BITS_START 1
+
+/**
+ * How many matching bits to end with
+ */
+#define MATCHING_BITS_END 50
+
+/**
+ * How many readings per matching bits value
+ */
+#define ITERATIONS 10
+
+/**
+ * Test name
+ */
+static const char *testname = "test_pow_sign";
+
+/**
+ * Name of GNUNET config file used in this test
+ */
+static const char *cfg_filename = "test_pow_sign.conf";
+
+/**
+ * Status of the test to be returned by main()
+ */
+static int ok = 1;
+
+/**
+ * Task used to shutdown / expire the test
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+/**
+ * Message to be exchanged
+ */
+static char msg[MSG_SIZE];
+
+/**
+ * Private key of sending peer
+ */
+static struct GNUNET_CRYPTO_EddsaPrivateKey *private_key;
+
+/**
+ * Public key of sending peer
+ */
+static struct GNUNET_CRYPTO_EddsaPublicKey *public_key;
+
+/**
+ * The current matching bits being evaluated
+ */
+static int current_matching_bits;
+
+/**
+ * How many iterations performed for this matching bits value
+ */
+static int performed_iterations;
+
+/**
+ * Total duration of all iterations
+ */
+static struct GNUNET_TIME_Relative total_duration;
+
+/**
+ * Task creating pow block
+ */
+struct GNUNET_SENSOR_crypto_pow_context *pow_task;
+
+
+/**
+ * Start a new pow calculation
+ */
+static void
+pow_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Shutdown task
+ *
+ * @param cls Closure (unused)
+ * @param tc Task context (unused)
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != pow_task)
+  {
+    GNUNET_SENSOR_crypto_pow_sign_cancel (pow_task);
+    pow_task = NULL;
+  }
+  if (NULL != private_key)
+  {
+    GNUNET_free (private_key);
+    private_key = NULL;
+  }
+  if (NULL != public_key)
+  {
+    GNUNET_free (public_key);
+    public_key = NULL;
+  }
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+static void
+pow_cb (void *cls, struct GNUNET_SENSOR_crypto_pow_block *block)
+{
+  struct GNUNET_TIME_Absolute end_time;
+  struct GNUNET_TIME_Relative duration;
+
+  pow_task = NULL;
+  end_time = GNUNET_TIME_absolute_get();
+  duration = GNUNET_TIME_absolute_get_difference (block->timestamp, end_time);
+  printf(".");
+  performed_iterations++;
+  total_duration = GNUNET_TIME_relative_add (total_duration, duration);
+  if (ITERATIONS == performed_iterations)
+  {
+    total_duration = GNUNET_TIME_relative_divide (total_duration, ITERATIONS);
+    printf ("Matching bits %d: %s\n", current_matching_bits,
+             GNUNET_STRINGS_relative_time_to_string(total_duration, 
GNUNET_NO));
+    total_duration = GNUNET_TIME_UNIT_ZERO;
+    performed_iterations = 0;
+    if (MATCHING_BITS_END == current_matching_bits)
+    {
+      ok = 0;
+      GNUNET_SCHEDULER_cancel (shutdown_task);
+      GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+      return;
+    }
+    current_matching_bits ++;
+  }
+  GNUNET_SCHEDULER_add_now (&pow_start, NULL);
+}
+
+
+/**
+ * Start a new pow calculation
+ */
+static void
+pow_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_TIME_Absolute timestamp;
+
+  timestamp = GNUNET_TIME_absolute_get ();
+  pow_task = GNUNET_SENSOR_crypto_pow_sign (msg, MSG_SIZE, &timestamp, 
public_key,
+                                 private_key, current_matching_bits, &pow_cb, 
NULL);
+}
+
+
+/**
+ * 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)
+{
+  /* generate random data block */
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, msg, MSG_SIZE);
+  /* get private and public keys */
+  private_key =
+      GNUNET_CRYPTO_eddsa_key_create_from_configuration (pinfo->result.cfg);
+  GNUNET_assert (NULL != private_key);
+  public_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPublicKey);
+  GNUNET_CRYPTO_eddsa_key_get_public (private_key, public_key);
+  current_matching_bits = MATCHING_BITS_START;
+  performed_iterations = 0;
+  total_duration = GNUNET_TIME_UNIT_ZERO;
+  GNUNET_TESTBED_operation_done (op);
+  GNUNET_SCHEDULER_add_now (&pow_start, NULL);
+}
+
+
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @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
+ *          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
+ * @see GNUNET_TESTBED_test_run()
+ */
+static void
+test_master (void *cls, struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded, unsigned int links_failed)
+{
+  GNUNET_assert (NUM_PEERS == num_peers);
+  GNUNET_assert (0 == links_failed);
+  shutdown_task =
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_shutdown, 
NULL);
+  GNUNET_TESTBED_peer_get_information (peers[0],
+                                       GNUNET_TESTBED_PIT_CONFIGURATION,
+                                       &peer_info_cb, peers[0]);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  GNUNET_log_setup (testname, "INFO", NULL);
+  if (GNUNET_OK ==
+      GNUNET_TESTBED_test_run (testname, cfg_filename, NUM_PEERS, 0, NULL, 
NULL,
+                               &test_master, NULL))
+    return ok;
+  return 1;
+}

Modified: gnunet/src/sensor/sensor_util_lib_crypto.c
===================================================================
--- gnunet/src/sensor/sensor_util_lib_crypto.c  2014-09-15 15:00:36 UTC (rev 
34293)
+++ gnunet/src/sensor/sensor_util_lib_crypto.c  2014-09-15 16:00:53 UTC (rev 
34294)
@@ -177,6 +177,7 @@
     GNUNET_SENSOR_crypto_pow_sign_cancel (cx);
     if (NULL != callback)
       callback (callback_cls, (GNUNET_OK == sign_result) ? result_block : 
NULL);
+    GNUNET_free (result_block);
     return;
   }
   cx->pow++;