[GNUnet-SVN] r23749 - gnunet/src/stream

[gnunet]

Author: harsha
Date: 2012-09-11 16:12:00 +0200 (Tue, 11 Sep 2012)
New Revision: 23749

Added:
   gnunet/src/stream/perf_stream_api.c
Modified:
   gnunet/src/stream/
   gnunet/src/stream/Makefile.am
Log:
stub for stream performance tests

Index: gnunet/src/stream
===================================================================
--- gnunet/src/stream   2012-09-11 12:55:53 UTC (rev 23748)
+++ gnunet/src/stream   2012-09-11 14:12:00 UTC (rev 23749)

Property changes on: gnunet/src/stream
___________________________________________________________________
Modified: svn:ignore
## -4,6 +4,7 ##
 test_stream_2peers_halfclose
 test_stream_big
 test_stream_sequence_wraparound
+perf_stream_api
 Makefile.in
 Makefile
 .deps
Modified: gnunet/src/stream/Makefile.am
===================================================================
--- gnunet/src/stream/Makefile.am       2012-09-11 12:55:53 UTC (rev 23748)
+++ gnunet/src/stream/Makefile.am       2012-09-11 14:12:00 UTC (rev 23749)
@@ -20,12 +20,18 @@
 libgnunetstream_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_BENCHMARKS
+ STREAM_BENCHMARKS = \
+ perf_stream_api
+endif
+
 check_PROGRAMS = \
  test_stream_2peers \
  test_stream_2peers_halfclose \
  test_stream_local \
  test_stream_big \
- test_stream_sequence_wraparound
+ test_stream_sequence_wraparound \
+ $(STREAM_BENCHMARKS)
 
 EXTRA_DIST = test_stream_local.conf
 
@@ -35,7 +41,8 @@
  test_stream_2peers_halfclose \
  test_stream_local \
  test_stream_big \
- test_stream_sequence_wraparound
+ test_stream_sequence_wraparound \
+ $(STREAM_BENCHMARKS)
 endif
 
 test_stream_2peers_SOURCES = \
@@ -73,3 +80,11 @@
  $(top_builddir)/src/stream/libgnunetstream.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la
+
+perf_stream_api_SOURCES = \
+ perf_stream_api.c
+perf_stream_api_LDADD = \
+ $(top_builddir)/src/stream/libgnunetstream.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la
\ No newline at end of file

Added: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c                         (rev 0)
+++ gnunet/src/stream/perf_stream_api.c 2012-09-11 14:12:00 UTC (rev 23749)
@@ -0,0 +1,184 @@
+/*
+     This file is part of GNUnet.
+     (C) 2011, 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 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 stream/perf_stream_api.c
+ * @brief performance benchmarks for stream api
+ * @author Sree Harsha Totakura
+ */
+
+/****************************************************************************************/
+/* Test is setup into the following major steps:                               
        */
+/*    1. Measurements over loopback (1 hop). i.e. we use only one peer and 
open                */
+/*       stream connections over loopback. Messages will go through            
        */
+/*       STREAM_API->MESH_API->MESH_SERVICE->MESH_API->STREAM_API.             
        */
+/*    2. Measurements over 2 peers (2 hops). We use testbed to create 2 peers, 
        */
+/*       connect them and then create stream connections. Messages will go 
through      */
+/*       
STREAM_API->MESH_API->MESH_SERVICE->CORE1.....CORE2->MESH_API->STREAM_API      
*/
+/*    3. Measurements over 3 peers (3 hops). We use testbed to create 3 peers, 
        */
+/*       connect them in a line topology: peer1->peer2->peer3. Messages will 
go                */
+/*       through                                                               
        */
+/*       
STREAM_API->MESH_API->MESH_SERVICE->CORE1..CORE2..CORE3->MESH_API->STREAM_API. 
*/
+/****************************************************************************************/
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_service.h"
+
+  
+/**
+ * Simple struct to keep track of progress, and print a
+ * nice little percentage meter for long running tasks.
+ */
+struct ProgressMeter
+{
+  unsigned int total;
+
+  unsigned int modnum;
+
+  unsigned int dotnum;
+
+  unsigned int completed;
+
+  int print;
+
+  char *startup_string;
+};
+
+#define DATA_SIZE 65536      /* 64KB */
+
+static uint32_t data[DATA_SIZE / 4];     /* 64KB array */
+
+static uint16_t payload_size[] = 
+{ 20, 500, 2000, 7000, 13000, 25000, 56000, 64000 };
+
+
+/**
+ * Create a meter to keep track of the progress of some task.
+ *
+ * @param total the total number of items to complete
+ * @param start_string a string to prefix the meter with (if printing)
+ * @param print GNUNET_YES to print the meter, GNUNET_NO to count
+ *              internally only
+ *
+ * @return the progress meter
+ */
+static struct ProgressMeter *
+create_meter (unsigned int total, char *start_string, int print)
+{
+  struct ProgressMeter *ret;
+
+  ret = GNUNET_malloc (sizeof (struct ProgressMeter));
+  ret->print = print;
+  ret->total = total;
+  ret->modnum = total / 4;
+  if (ret->modnum == 0)         /* Divide by zero check */
+    ret->modnum = 1;
+  ret->dotnum = (total / 50) + 1;
+  if (start_string != NULL)
+    ret->startup_string = GNUNET_strdup (start_string);
+  else
+    ret->startup_string = GNUNET_strdup ("");
+
+  return ret;
+}
+
+
+/**
+ * Update progress meter (increment by one).
+ *
+ * @param meter the meter to update and print info for
+ *
+ * @return GNUNET_YES if called the total requested,
+ *         GNUNET_NO if more items expected
+ */
+static int
+update_meter (struct ProgressMeter *meter)
+{
+  if (meter->print == GNUNET_YES)
+  {
+    if (meter->completed % meter->modnum == 0)
+    {
+      if (meter->completed == 0)
+      {
+        FPRINTF (stdout, "%sProgress: [0%%", meter->startup_string);
+      }
+      else
+        FPRINTF (stdout, "%d%%",
+                 (int) (((float) meter->completed / meter->total) * 100));
+    }
+    else if (meter->completed % meter->dotnum == 0)
+      FPRINTF (stdout, "%s",  ".");
+
+    if (meter->completed + 1 == meter->total)
+      FPRINTF (stdout, "%d%%]\n", 100);
+    fflush (stdout);
+  }
+  meter->completed++;
+
+  if (meter->completed == meter->total)
+    return GNUNET_YES;
+  if (meter->completed > meter->total)
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Progress meter overflow!!\n");
+  return GNUNET_NO;
+}
+
+
+/**
+ * Reset progress meter.
+ *
+ * @param meter the meter to reset
+ *
+ * @return GNUNET_YES if meter reset,
+ *         GNUNET_SYSERR on error
+ */
+static int
+reset_meter (struct ProgressMeter *meter)
+{
+  if (meter == NULL)
+    return GNUNET_SYSERR;
+
+  meter->completed = 0;
+  return GNUNET_YES;
+}
+
+
+/**
+ * Release resources for meter
+ *
+ * @param meter the meter to free
+ */
+static void
+free_meter (struct ProgressMeter *meter)
+{
+  GNUNET_free_non_null (meter->startup_string);
+  GNUNET_free (meter);
+}
+
+
+/**
+ * Main function
+ */
+int main (int argc, char **argv)
+{
+  PRINTF ("Performance measurements for STREAM\n");
+  return 0;
+}