X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdatastore%2Fperf_plugin_datastore.c;h=908a7ee5564294cff8a39ef7246cd634dbadcaf2;hb=9a50e92d4a43f917b0cd1ed34d4932470cb3a3da;hp=763b387662903ecbca3b8a1d7243a990623838ea;hpb=dadbf4c950bf4cd459c95ac4ab61a02af7b3668b;p=oweals%2Fgnunet.git diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index 763b38766..908a7ee55 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -27,7 +27,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_plugin.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include /** @@ -103,7 +103,7 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k) { char value[65536]; size_t size; - static GNUNET_HashCode key; + static struct GNUNET_HashCode key; static int ic; char *msg; unsigned int prio; @@ -115,8 +115,8 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k) size = size - (size & 7); /* always multiple of 8 */ /* generate random key */ - key.bits[0] = (unsigned int) GNUNET_TIME_absolute_get ().abs_value; - GNUNET_CRYPTO_hash (&key, sizeof (GNUNET_HashCode), &key); + key.bits[0] = (unsigned int) GNUNET_TIME_absolute_get ().abs_value_us; + GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &key); memset (value, i, size); if (i > 255) memset (value, i - 255, size / 2); @@ -149,7 +149,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); static int -iterate_zeros (void *cls, const GNUNET_HashCode * key, uint32_t size, +iterate_zeros (void *cls, const struct GNUNET_HashCode * key, uint32_t size, const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority, uint32_t anonymity, struct GNUNET_TIME_Absolute expiration, uint64_t uid) @@ -163,9 +163,11 @@ iterate_zeros (void *cls, const GNUNET_HashCode * key, uint32_t size, memcpy (&i, &cdata[4], sizeof (i)); hits[i / 8] |= (1 << (i % 8)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Found result type=%u, priority=%u, size=%u, expire=%llu\n", - type, priority, size, (unsigned long long) expiration.abs_value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Found result %d type=%u, priority=%u, size=%u, expire=%s\n", + i, + type, priority, size, + GNUNET_STRINGS_absolute_time_to_string (expiration)); crc->cnt++; if (crc->cnt == PUT_10 / 4 - 1) { @@ -177,13 +179,15 @@ iterate_zeros (void *cls, const GNUNET_HashCode * key, uint32_t size, bc++; crc->end = GNUNET_TIME_absolute_get (); - printf ("%s took %llu ms yielding %u/%u items\n", + printf ("%s took %s yielding %u/%u items\n", "Select random zero-anonymity item", - (unsigned long long) (crc->end.abs_value - crc->start.abs_value), + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (crc->start, + crc->end), + GNUNET_YES), bc, crc->cnt); if (crc->cnt > 0) GAUGER (category, "Select random zero-anonymity item", - (crc->end.abs_value - crc->start.abs_value) / crc->cnt, + (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt, "ms/item"); memset (hits, 0, sizeof (hits)); crc->phase++; @@ -196,7 +200,7 @@ iterate_zeros (void *cls, const GNUNET_HashCode * key, uint32_t size, static int -expiration_get (void *cls, const GNUNET_HashCode * key, uint32_t size, +expiration_get (void *cls, const struct GNUNET_HashCode * key, uint32_t size, const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority, uint32_t anonymity, struct GNUNET_TIME_Absolute expiration, uint64_t uid) @@ -219,13 +223,15 @@ expiration_get (void *cls, const GNUNET_HashCode * key, uint32_t size, bc++; crc->end = GNUNET_TIME_absolute_get (); - printf ("%s took %llu ms yielding %u/%u items\n", + printf ("%s took %s yielding %u/%u items\n", "Selecting and deleting by expiration", - (unsigned long long) (crc->end.abs_value - crc->start.abs_value), + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (crc->start, + crc->end), + GNUNET_YES), bc, (unsigned int) PUT_10); if (crc->cnt > 0) GAUGER (category, "Selecting and deleting by expiration", - (crc->end.abs_value - crc->start.abs_value) / crc->cnt, + (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt, "ms/item"); memset (hits, 0, sizeof (hits)); if (++crc->iter == ITERATIONS) @@ -241,7 +247,7 @@ expiration_get (void *cls, const GNUNET_HashCode * key, uint32_t size, static int -replication_get (void *cls, const GNUNET_HashCode * key, uint32_t size, +replication_get (void *cls, const struct GNUNET_HashCode * key, uint32_t size, const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority, uint32_t anonymity, struct GNUNET_TIME_Absolute expiration, uint64_t uid) @@ -265,13 +271,15 @@ replication_get (void *cls, const GNUNET_HashCode * key, uint32_t size, bc++; crc->end = GNUNET_TIME_absolute_get (); - printf ("%s took %llu ms yielding %u/%u items\n", + printf ("%s took %s yielding %u/%u items\n", "Selecting random item for replication", - (unsigned long long) (crc->end.abs_value - crc->start.abs_value), + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (crc->start, + crc->end), + GNUNET_YES), bc, (unsigned int) PUT_10); if (crc->cnt > 0) GAUGER (category, "Selecting random item for replication", - (crc->end.abs_value - crc->start.abs_value) / crc->cnt, + (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt, "ms/item"); memset (hits, 0, sizeof (hits)); crc->phase++; @@ -341,7 +349,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_break (0); crc->phase = RP_ERROR; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "In phase %d, iteration %u\n", crc->phase, crc->cnt); switch (crc->phase) { @@ -358,12 +366,14 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) putValue (crc->api, j, crc->i); crc->end = GNUNET_TIME_absolute_get (); { - printf ("%s took %llu ms for %llu items\n", "Storing an item", - (unsigned long long) (crc->end.abs_value - crc->start.abs_value), + printf ("%s took %s for %llu items\n", "Storing an item", + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (crc->start, + crc->end), + GNUNET_YES), PUT_10); if (PUT_10 > 0) GAUGER (category, "Storing an item", - (crc->end.abs_value - crc->start.abs_value) / PUT_10, + (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / PUT_10, "ms/item"); } crc->i++; @@ -420,6 +430,8 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg) if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env))) { FPRINTF (stderr, "Failed to load plugin `%s'!\n", name); + GNUNET_free (name); + GNUNET_free (libname); return NULL; } GNUNET_free (libname); @@ -435,6 +447,11 @@ run (void *cls, char *const *args, const char *cfgfile, struct GNUNET_DATASTORE_PluginFunctions *api; struct CpsRunContext *crc; + if (NULL == c) + { + GNUNET_break (0); + return; + } api = load_plugin (c); if (api == NULL) { @@ -456,7 +473,7 @@ main (int argc, char *argv[]) { char dir_name[128]; char cfg_name[128]; - char *const argv[] = { + char *const xargv[] = { "perf-plugin-datastore", "-c", cfg_name, @@ -476,7 +493,7 @@ main (int argc, char *argv[]) GNUNET_snprintf (category, sizeof (category), "DATASTORE-%s", plugin_name); GNUNET_snprintf (cfg_name, sizeof (cfg_name), "perf_plugin_datastore_data_%s.conf", plugin_name); - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, + GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, "perf-plugin-datastore", "nohelp", options, &run, NULL); if (ok != 0) FPRINTF (stderr, "Missed some testcases: %u\n", ok);