#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"
/**
* Number of put operations to perform.
static void
-gen_key (int i, GNUNET_HashCode * key)
+gen_key (int i, struct GNUNET_HashCode * key)
{
- memset (key, 0, sizeof (GNUNET_HashCode));
+ memset (key, 0, sizeof (struct GNUNET_HashCode));
key->bits[0] = (unsigned int) i;
- GNUNET_CRYPTO_hash (key, sizeof (GNUNET_HashCode), key);
+ GNUNET_CRYPTO_hash (key, sizeof (struct GNUNET_HashCode), key);
}
{
char value[65536];
size_t size;
- GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
char *msg;
unsigned int prio;
static int
-iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
+iterate_one_shot (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)
guid = uid;
crc->phase++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found result type=%u, priority=%u, size=%u, expire=%llu, key %s\n",
- type, priority, size, (unsigned long long) expiration.abs_value,
+ "Found result type=%u, priority=%u, size=%u, expire=%s, key %s\n",
+ type, priority, size,
+ GNUNET_STRINGS_absolute_time_to_string (expiration),
GNUNET_h2s (key));
GNUNET_SCHEDULER_add_now (&test, crc);
return GNUNET_OK;
int j;
unsigned long long os;
unsigned long long cs;
- GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test aborted.\n");
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)
{
if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
{
FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
+ GNUNET_free (libname);
+ GNUNET_free (name);
return NULL;
}
GNUNET_free (libname);
"%s", "Could not initialize plugin, assuming database not configured. Test not run!\n");
return;
}
- crc = GNUNET_malloc (sizeof (struct CpsRunContext));
+ crc = GNUNET_new (struct CpsRunContext);
crc->api = api;
crc->cfg = c;
crc->phase = RP_PUT;