X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdatacache%2Fperf_datacache.c;h=b01b9f9c492553f9719fda6dade11bb11fce8730;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=0f4fea4197721bb0f9106dbb0d7546c50312f317;hpb=416c2f5a713b93ba689a8cd1e038682a53e6bc17;p=oweals%2Fgnunet.git diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 0f4fea419..b01b9f9c4 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2006, 2009, 2010 Christian Grothoff (and other contributing authors) + Copyright (C) 2006, 2009, 2010 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ 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. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* * @file datacache/perf_datacache.c @@ -25,9 +25,9 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" +#include "gnunet_testing_lib.h" #include -#define VERBOSE GNUNET_EXTRA_LOGGING #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) @@ -44,11 +44,14 @@ static const char *plugin_name; static int -checkIt (void *cls, struct GNUNET_TIME_Absolute exp, - const GNUNET_HashCode * key, size_t size, const char *data, - enum GNUNET_BLOCK_Type type) +checkIt (void *cls, + const struct GNUNET_HashCode * key, size_t size, const char *data, + enum GNUNET_BLOCK_Type type, + struct GNUNET_TIME_Absolute exp, + unsigned int path_len, + const struct GNUNET_PeerIdentity *path) { - if ((size == sizeof (GNUNET_HashCode)) && (0 == memcmp (data, cls, size))) + if ((size == sizeof (struct GNUNET_HashCode)) && (0 == memcmp (data, cls, size))) found++; return GNUNET_OK; } @@ -59,8 +62,8 @@ run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_DATACACHE_Handle *h; - GNUNET_HashCode k; - GNUNET_HashCode n; + struct GNUNET_HashCode k; + struct GNUNET_HashCode n; struct GNUNET_TIME_Absolute exp; struct GNUNET_TIME_Absolute start; unsigned int i; @@ -72,49 +75,49 @@ run (void *cls, char *const *args, const char *cfgfile, if (h == NULL) { FPRINTF (stderr, "%s", "Failed to initialize datacache. Database likely not setup, skipping test.\n"); + ok = 77; /* mark test as skipped */ return; } exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS); start = GNUNET_TIME_absolute_get (); - memset (&k, 0, sizeof (GNUNET_HashCode)); + memset (&k, 0, sizeof (struct GNUNET_HashCode)); for (i = 0; i < ITERATIONS; i++) { if (0 == i % (ITERATIONS / 80)) FPRINTF (stderr, "%s", "."); - GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n); + GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); ASSERT (GNUNET_OK == - GNUNET_DATACACHE_put (h, &k, sizeof (GNUNET_HashCode), - (const char *) &n, 1 + i % 16, exp)); + GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode), + (const char *) &n, 1 + i % 16, exp, + 0, NULL)); k = n; } FPRINTF (stderr, "%s", "\n"); - FPRINTF (stdout, "Stored %u items in %llums\n", ITERATIONS, - (unsigned long long) - GNUNET_TIME_absolute_get_duration (start).rel_value); + FPRINTF (stdout, "Stored %u items in %s\n", ITERATIONS, + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); GNUNET_snprintf (gstr, sizeof (gstr), "DATACACHE-%s", plugin_name); GAUGER (gstr, "Time to PUT item in datacache", - GNUNET_TIME_absolute_get_duration (start).rel_value / ITERATIONS, + GNUNET_TIME_absolute_get_duration (start).rel_value_us / 1000LL / ITERATIONS, "ms/item"); start = GNUNET_TIME_absolute_get (); - memset (&k, 0, sizeof (GNUNET_HashCode)); + memset (&k, 0, sizeof (struct GNUNET_HashCode)); for (i = 0; i < ITERATIONS; i++) { if (0 == i % (ITERATIONS / 80)) FPRINTF (stderr, "%s", "."); - GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n); + GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); GNUNET_DATACACHE_get (h, &k, 1 + i % 16, &checkIt, &n); k = n; } FPRINTF (stderr, "%s", "\n"); FPRINTF (stdout, - "Found %u/%u items in %llums (%u were deleted during storage processing)\n", + "Found %u/%u items in %s (%u were deleted during storage processing)\n", found, ITERATIONS, - (unsigned long long) - GNUNET_TIME_absolute_get_duration (start).rel_value, + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES), ITERATIONS - found); if (found > 0) GAUGER (gstr, "Time to GET item from datacache", - GNUNET_TIME_absolute_get_duration (start).rel_value / found, + GNUNET_TIME_absolute_get_duration (start).rel_value_us / 1000LL / found, "ms/item"); GNUNET_DATACACHE_destroy (h); ASSERT (ok == 0); @@ -129,16 +132,11 @@ FAILURE: int main (int argc, char *argv[]) { - char *pos; char cfg_name[128]; - char *const xargv[] = { "perf-datacache", "-c", cfg_name, -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -146,28 +144,14 @@ main (int argc, char *argv[]) }; GNUNET_log_setup ("perf-datacache", -#if VERBOSE - "DEBUG", -#else "WARNING", -#endif NULL); - /* determine name of plugin to use */ - plugin_name = argv[0]; - while (NULL != (pos = strstr (plugin_name, "_"))) - plugin_name = pos + 1; - if (NULL != (pos = strstr (plugin_name, "."))) - pos[0] = 0; - else - pos = (char *) plugin_name; - + plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); GNUNET_snprintf (cfg_name, sizeof (cfg_name), "perf_datacache_data_%s.conf", plugin_name); - if (pos != plugin_name) - pos[0] = '.'; GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, "perf-datacache", "nohelp", options, &run, NULL); - if (ok != 0) + if ( (0 != ok) && (77 != ok) ) FPRINTF (stderr, "Missed some perfcases: %d\n", ok); return ok; }