[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33634 - gnunet/src/peerstore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33634 - gnunet/src/peerstore |
Date: |
Wed, 11 Jun 2014 11:15:37 +0200 |
Author: wachs
Date: 2014-06-11 11:15:37 +0200 (Wed, 11 Jun 2014)
New Revision: 33634
Added:
gnunet/src/peerstore/perf_peerstore_store.c
Removed:
gnunet/src/peerstore/test_peerstore_stress_store.c
Modified:
gnunet/src/peerstore/Makefile.am
Log:
renaming to perf test
Modified: gnunet/src/peerstore/Makefile.am
===================================================================
--- gnunet/src/peerstore/Makefile.am 2014-06-11 08:53:09 UTC (rev 33633)
+++ gnunet/src/peerstore/Makefile.am 2014-06-11 09:15:37 UTC (rev 33634)
@@ -68,8 +68,8 @@
test_peerstore_api_store \
test_peerstore_api_iterate \
test_peerstore_api_watch \
- test_peerstore_stress_store
-
+ perf_peerstore_store
+
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
TESTS = $(check_PROGRAMS)
@@ -96,9 +96,9 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_peerstore_stress_store_SOURCES = \
- test_peerstore_stress_store.c
-test_peerstore_stress_store_LDADD = \
+perf_peerstore_store_SOURCES = \
+ perf_peerstore_store.c
+perf_peerstore_store_LDADD = \
$(top_builddir)/src/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
Copied: gnunet/src/peerstore/perf_peerstore_store.c (from rev 33633,
gnunet/src/peerstore/test_peerstore_stress_store.c)
===================================================================
--- gnunet/src/peerstore/perf_peerstore_store.c (rev 0)
+++ gnunet/src/peerstore/perf_peerstore_store.c 2014-06-11 09:15:37 UTC (rev
33634)
@@ -0,0 +1,118 @@
+/*
+ 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 peerstore/perf_peerstore_store.c
+ * @brief performance test for peerstore store operation
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_peerstore_service.h"
+
+#define STORES 10000
+
+static int ok = 1;
+
+struct GNUNET_PEERSTORE_Handle *h;
+
+char *ss = "test_peerstore_stress";
+struct GNUNET_PeerIdentity p;
+char *k = "test_peerstore_stress_key";
+char *v = "test_peerstore_stress_val";
+
+int count = 0;
+
+void
+disconnect()
+{
+ if(NULL != h)
+ GNUNET_PEERSTORE_disconnect(h);
+ GNUNET_SCHEDULER_shutdown();
+}
+
+void
+store()
+{
+ GNUNET_PEERSTORE_store(h,
+ ss,
+ &p,
+ k,
+ v,
+ strlen(v) + 1,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ (count == 0) ? GNUNET_PEERSTORE_STOREOPTION_REPLACE :
GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
+ NULL,
+ NULL);
+ count++;
+}
+
+static int
+watch_cb(void *cls,
+ struct GNUNET_PEERSTORE_Record *record,
+ char *emsg)
+{
+ GNUNET_assert(NULL == emsg);
+ if(STORES == count)
+ {
+ ok = 0;
+ disconnect();
+ }
+ else
+ store();
+ return GNUNET_YES;
+}
+
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ memset (&p, 5, sizeof (p));
+ h = GNUNET_PEERSTORE_connect(cfg);
+ GNUNET_assert(NULL != h);
+ GNUNET_PEERSTORE_watch(h,
+ ss,
+ &p,
+ k,
+ &watch_cb,
+ NULL);
+ store();
+}
+
+int
+main (int argc, char *argv[])
+{
+ struct GNUNET_TIME_Absolute start;
+ struct GNUNET_TIME_Relative diff;
+
+ start = GNUNET_TIME_absolute_get();
+ if (0 != GNUNET_TESTING_service_run ("perf-peerstore-store",
+ "peerstore",
+ "test_peerstore_api_data.conf",
+ &run, NULL))
+ return 1;
+ diff = GNUNET_TIME_absolute_get_duration(start);
+ fprintf(stderr, "Stored and retrieved %d records in %s (%s).\n",
+ STORES, GNUNET_STRINGS_relative_time_to_string(diff, GNUNET_YES),
+ GNUNET_STRINGS_relative_time_to_string(diff, GNUNET_NO));
+ return ok;
+}
+
+/* end of perf_peerstore_store.c */
Deleted: gnunet/src/peerstore/test_peerstore_stress_store.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_stress_store.c 2014-06-11 08:53:09 UTC
(rev 33633)
+++ gnunet/src/peerstore/test_peerstore_stress_store.c 2014-06-11 09:15:37 UTC
(rev 33634)
@@ -1,120 +0,0 @@
-/*
- 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 peerstore/test_peerstore_stress_store.c
- * @brief stress test for peerstore store operation
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_peerstore_service.h"
-
-#define STORES 10000
-
-static int ok = 1;
-
-struct GNUNET_PEERSTORE_Handle *h;
-
-char *ss = "test_peerstore_stress";
-struct GNUNET_PeerIdentity p;
-char *k = "test_peerstore_stress_key";
-char *v = "test_peerstore_stress_val";
-
-int count = 0;
-
-void
-disconnect()
-{
- if(NULL != h)
- GNUNET_PEERSTORE_disconnect(h);
- GNUNET_SCHEDULER_shutdown();
-}
-
-void
-store()
-{
- GNUNET_PEERSTORE_store(h,
- ss,
- &p,
- k,
- v,
- strlen(v) + 1,
- GNUNET_TIME_UNIT_FOREVER_ABS,
- (count == 0) ? GNUNET_PEERSTORE_STOREOPTION_REPLACE :
GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
- NULL,
- NULL);
- count++;
-}
-
-static int
-watch_cb(void *cls,
- struct GNUNET_PEERSTORE_Record *record,
- char *emsg)
-{
- GNUNET_assert(NULL == emsg);
- if(STORES == count)
- {
- ok = 0;
- disconnect();
- }
- else
- store();
- return GNUNET_YES;
-}
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- memset (&p, 5, sizeof (p));
- h = GNUNET_PEERSTORE_connect(cfg);
- GNUNET_assert(NULL != h);
- GNUNET_PEERSTORE_watch(h,
- ss,
- &p,
- k,
- &watch_cb,
- NULL);
- store();
-}
-
-int
-main (int argc, char *argv[])
-{
- struct GNUNET_TIME_Absolute start;
- struct GNUNET_TIME_Absolute end;
- struct GNUNET_TIME_Relative diff;
-
- start = GNUNET_TIME_absolute_get();
- if (0 != GNUNET_TESTING_service_run ("test-gnunet-peerstore",
- "peerstore",
- "test_peerstore_api_data.conf",
- &run, NULL))
- return 1;
- end = GNUNET_TIME_absolute_get();
- diff = GNUNET_TIME_absolute_get_difference(start, end);
- printf("Stored and retrieved %d records in %s (%s).\n",
- STORES, GNUNET_STRINGS_relative_time_to_string(diff, GNUNET_YES),
- GNUNET_STRINGS_relative_time_to_string(diff, GNUNET_NO));
- return ok;
-}
-
-/* end of test_peerstore_stress.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33634 - gnunet/src/peerstore,
gnunet <=