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 2, or (at your
+ 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
static unsigned long long stored_ops;
+static const char *plugin_name;
+
static int ok;
enum RunPhase
};
+/**
+ * Function called by plugins to notify us about a
+ * change in their disk utilization.
+ *
+ * @param cls closure (NULL)
+ * @param delta change in disk utilization,
+ * 0 for "reset to empty"
+ */
+static void
+disk_utilization_change_cb (void *cls,
+ int delta)
+{
+}
+
static void
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 ().value;
+ key.bits[0] = (unsigned int) GNUNET_TIME_absolute_get ().abs_value;
GNUNET_CRYPTO_hash (&key, sizeof (GNUNET_HashCode), &key);
memset (value, i, size);
if (i > 255)
const GNUNET_HashCode * key,
uint32_t size,
const void *data,
- uint32_t type,
+ enum GNUNET_BLOCK_Type type,
uint32_t priority,
uint32_t anonymity,
struct GNUNET_TIME_Absolute
crc->end = GNUNET_TIME_absolute_get();
printf (crc->msg,
crc->i,
- (unsigned long long) (crc->end.value - crc->start.value),
+ (unsigned long long) (crc->end.abs_value - crc->start.abs_value),
crc->cnt);
if (crc->phase != RP_AN_GET)
{
crc->phase = RP_PUT;
}
GNUNET_SCHEDULER_add_after (crc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
&test, crc);
return GNUNET_OK;
#if VERBOSE
fprintf (stderr, "Found result type=%u, priority=%u, size=%u, expire=%llu\n",
type, priority, size,
- (unsigned long long) expiration.value);
+ (unsigned long long) expiration.abs_value);
#endif
crc->cnt++;
crc->api->next_request (next_cls,
crc->end = GNUNET_TIME_absolute_get ();
printf ("%3u insertion took %20llums for %u\n",
crc->i,
- (unsigned long long) (crc->end.value - crc->start.value),
+ (unsigned long long) (crc->end.abs_value - crc->start.abs_value),
(unsigned int) PUT_10);
crc->i++;
crc->phase = RP_LP_GET;
GNUNET_SCHEDULER_add_after (crc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
&test, crc);
break;
break;
case RP_DONE:
crc->api->drop (crc->api->cls);
- GNUNET_SCHEDULER_add_delayed (crc->sched,
- GNUNET_YES,
+ GNUNET_SCHEDULER_add_with_priority (crc->sched,
GNUNET_SCHEDULER_PRIORITY_IDLE,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_ZERO,
&cleaning_task, crc);
break;
}
}
env.cfg = cfg;
env.sched = sched;
+ env.duc = &disk_utilization_change_cb;
+ env.cls = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Loading `%s' datastore plugin\n"), name);
GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
- GNUNET_assert (NULL != (ret = GNUNET_PLUGIN_load (libname, &env)));
+ if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
+ {
+ fprintf (stderr,
+ "Failed to load plugin `%s'!\n",
+ name);
+ return NULL;
+ }
GNUNET_free (libname);
GNUNET_free (name);
return ret;
struct CpsRunContext *crc;
api = load_plugin (c, s);
- GNUNET_assert (api != NULL);
+ if (api == NULL)
+ {
+ fprintf (stderr,
+ "Could not initialize plugin, assuming database not configured. Test not run!\n");
+ return;
+ }
crc = GNUNET_malloc(sizeof(struct CpsRunContext));
crc->api = api;
crc->sched = s;
crc->cfg = c;
crc->phase = RP_PUT;
- GNUNET_SCHEDULER_add_after (s,
- GNUNET_YES,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_TASK,
- &test, crc);
+ GNUNET_SCHEDULER_add_now (crc->sched,
+ &test, crc);
}
static int
check ()
{
+ char cfg_name[128];
char *const argv[] = {
"perf-plugin-datastore",
"-c",
- "perf_plugin_datastore_data.conf",
+ cfg_name,
#if VERBOSE
"-L", "DEBUG",
#endif
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+
+ GNUNET_snprintf (cfg_name,
+ sizeof (cfg_name),
+ "perf_plugin_datastore_data_%s.conf",
+ plugin_name);
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "perf-plugin-datastore", "nohelp",
options, &run, NULL);
main (int argc, char *argv[])
{
int ret;
-
- GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
+ const char *pos;
+ char dir_name[128];
+
+ /* determine name of plugin to use */
+ plugin_name = argv[0];
+ while (NULL != (pos = strstr(plugin_name, "_")))
+ plugin_name = pos+1;
+
+ GNUNET_snprintf (dir_name,
+ sizeof (dir_name),
+ "/tmp/perf-gnunet-datastore-%s",
+ plugin_name);
+ GNUNET_DISK_directory_remove (dir_name);
GNUNET_log_setup ("perf-plugin-datastore",
#if VERBOSE
"DEBUG",
#endif
NULL);
ret = check ();
- GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
+ GNUNET_DISK_directory_remove (dir_name);
return ret;
}
-
/* end of perf_plugin_datastore.c */