#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
static int
-checkIt (void *cls, struct GNUNET_TIME_Absolute exp,
+checkIt (void *cls,
const struct GNUNET_HashCode * key, size_t size, const char *data,
- enum GNUNET_BLOCK_Type type)
+ enum GNUNET_BLOCK_Type type,
+ struct GNUNET_TIME_Absolute exp,
+ unsigned int path_len,
+ const struct GNUNET_PeerIdentity *path)
{
if ((size == sizeof (struct GNUNET_HashCode)) && (0 == memcmp (data, cls, size)))
found++;
GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
ASSERT (GNUNET_OK ==
GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
- (const char *) &n, 1 + i % 16, exp));
+ (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 (struct GNUNET_HashCode));
}
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);