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
#include "gnunet_protocols.h"
#include "plugin_datastore.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
/**
* Target datastore size (in bytes). Realistic sizes are
* those take too long to run them in the usual "make check"
* sequence. Hence the value used for shipping is tiny.
*/
-#define MAX_SIZE 1024LL * 1024
-/* * 128 */
+#define MAX_SIZE 1024LL * 1024 * 128
-#define ITERATIONS 2
+#define ITERATIONS 10
/**
* Number of put operations equivalent to 1/10th of MAX_SIZE
static unsigned long long stored_ops;
+static const char *plugin_name;
+
static int ok;
enum RunPhase
struct GNUNET_TIME_Absolute start;
struct GNUNET_TIME_Absolute end;
struct GNUNET_SCHEDULER_Handle *sched;
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_DATASTORE_PluginFunctions * api;
const char *msg;
enum RunPhase phase;
+ unsigned int cnt;
};
static GNUNET_HashCode key;
static int ic;
char *msg;
+ unsigned int prio;
/* most content is 32k */
size = 32 * 1024;
memset (value, i - 255, size / 2);
value[0] = k;
msg = NULL;
+ prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
if (GNUNET_OK != api->put (api->cls,
&key,
size,
value,
i,
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100),
+ prio,
i,
GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
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.value - crc->start.value),
+ crc->cnt);
if (crc->phase != RP_AN_GET)
{
crc->phase++;
crc->phase = RP_PUT;
}
GNUNET_SCHEDULER_add_after (crc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+ GNUNET_SCHEDULER_NO_TASK,
&test, crc);
return GNUNET_OK;
}
- fprintf (stderr, ".");
+#if VERBOSE
+ fprintf (stderr, "Found result type=%u, priority=%u, size=%u, expire=%llu\n",
+ type, priority, size,
+ (unsigned long long) expiration.value);
+#endif
+ crc->cnt++;
crc->api->next_request (next_cls,
GNUNET_NO);
return GNUNET_OK;
* down. Unloads our datastore plugin.
*
* @param api api to unload
+ * @param cfg configuration to use
*/
static void
unload_plugin (struct GNUNET_DATASTORE_PluginFunctions * api,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *name;
char *libname;
for (j=0;j<PUT_10;j++)
putValue (crc->api, j, crc->i);
crc->end = GNUNET_TIME_absolute_get ();
- printf ("%3u insertion took %20llums\n", crc->i,
- (unsigned long long) (crc->end.value - crc->start.value));
+ printf ("%3u insertion took %20llums for %u\n",
+ crc->i,
+ (unsigned long long) (crc->end.value - crc->start.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_PREREQUISITE_TASK,
+ GNUNET_SCHEDULER_NO_TASK,
&test, crc);
break;
case RP_LP_GET:
+ crc->cnt = 0;
crc->start = GNUNET_TIME_absolute_get ();
- crc->msg = "%3u low priority iteration took %20llums\n";
+ crc->msg = "%3u low priority iteration took %20llums for %u\n";
crc->api->iter_low_priority (crc->api->cls, 0,
&iterateDummy,
crc);
break;
case RP_AE_GET:
+ crc->cnt = 0;
crc->start = GNUNET_TIME_absolute_get ();
- crc->msg = "%3u ascending expiration iteration took %20llums\n";
+ crc->msg = "%3u ascending expiration iteration took %20llums for %u\n";
crc->api->iter_ascending_expiration (crc->api->cls, 0,
&iterateDummy,
crc);
break;
case RP_ZA_GET:
+ crc->cnt = 0;
crc->start = GNUNET_TIME_absolute_get ();
- crc->msg = "%3u zero anonymity iteration took %20llums\n";
+ crc->msg = "%3u zero anonymity iteration took %20llums for %u\n";
crc->api->iter_zero_anonymity (crc->api->cls, 0,
&iterateDummy,
crc);
break;
case RP_MO_GET:
+ crc->cnt = 0;
crc->start = GNUNET_TIME_absolute_get ();
- crc->msg = "%3u migration order iteration took %20llums\n";
+ crc->msg = "%3u migration order iteration took %20llums for %u\n";
crc->api->iter_migration_order (crc->api->cls, 0,
&iterateDummy,
crc);
break;
case RP_AN_GET:
+ crc->cnt = 0;
crc->start = GNUNET_TIME_absolute_get ();
- crc->msg = "%3u all now iteration took %20llums\n";
+ crc->msg = "%3u all now iteration took %20llums for %u\n";
crc->api->iter_all_now (crc->api->cls, 0,
&iterateDummy,
crc);
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_PREREQUISITE_TASK,
- GNUNET_TIME_UNIT_ZERO,
&cleaning_task, crc);
break;
}
* Load the datastore plugin.
*/
static struct GNUNET_DATASTORE_PluginFunctions *
-load_plugin (struct GNUNET_CONFIGURATION_Handle *cfg,
+load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_SCHEDULER_Handle *sched)
{
static struct GNUNET_DATASTORE_PluginEnvironment env;
struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
- struct GNUNET_CONFIGURATION_Handle *c)
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
struct GNUNET_DATASTORE_PluginFunctions *api;
struct CpsRunContext *crc;
crc->cfg = c;
crc->phase = RP_PUT;
GNUNET_SCHEDULER_add_after (s,
- GNUNET_YES,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+ GNUNET_SCHEDULER_NO_TASK,
&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;
-
+ 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 (dir_name);
return ret;
}
-
/* end of perf_plugin_datastore.c */