/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006, 2007, 2009, 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
+#include <gauger.h>
#define VERBOSE GNUNET_NO
RP_DONE = 0,
RP_PUT,
RP_CUT,
- RP_REPORT
+ RP_REPORT,
+ RP_ERROR
};
struct CpsRunContext
{
- struct GNUNET_SCHEDULER_Handle *sched;
const struct GNUNET_CONFIGURATION_Handle *cfg;
enum RunPhase phase;
int j;
unsigned long long size;
int i;
-
- GNUNET_HashCode key;
- size_t esize;
- char data[65536];
};
const char *msg)
{
struct CpsRunContext *crc = cls;
+
if (GNUNET_OK != success)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "%s\n", msg);
- GNUNET_assert (GNUNET_OK == success);
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Check success failed: `%s'\n", msg);
+ crc->phase = RP_ERROR;
+ GNUNET_SCHEDULER_add_now (&run_continuation,
+ crc);
+ return;
+ }
#if REPORT_ID
fprintf (stderr, "I");
#endif
stored_ops++;
stored_entries++;
crc->j++;
- if (crc->j == PUT_10)
+ if (crc->j >= PUT_10)
{
crc->j = 0;
crc->i++;
else
crc->phase = RP_CUT;
}
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
{
struct CpsRunContext *crc = cls;
+ if (GNUNET_OK != success)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "remove_next failed: `%s'\n", msg);
+ crc->phase = RP_ERROR;
+ GNUNET_SCHEDULER_add_now (&run_continuation,
+ crc);
+ return;
+ }
#if REPORT_ID
fprintf (stderr, "D");
#endif
GNUNET_assert (GNUNET_OK == success);
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-}
-
-
-
-static void
-do_delete (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct CpsRunContext *crc = cls;
-
- stored_bytes -= crc->esize;
- stored_entries--;
- stored_ops++;
- GNUNET_DATASTORE_remove (datastore,
- &crc->key,
- crc->esize,
- crc->data,
- 1, 1, TIMEOUT,
- &remove_next,
- crc);
+ GNUNET_SCHEDULER_add_now (&run_continuation,
+ crc);
}
-
static void
delete_value (void *cls,
- const GNUNET_HashCode * key,
+ const GNUNET_HashCode *key,
size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
{
struct CpsRunContext *crc = cls;
- if (key == NULL)
- {
- if (stored_bytes < MAX_SIZE)
- {
- crc->phase = RP_REPORT;
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
- GNUNET_SCHEDULER_add_with_priority (crc->sched,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
- &do_delete,
- crc);
- return;
- }
+ GNUNET_assert (NULL != key);
+ stored_ops++;
+ stored_bytes -= size;
+ stored_entries--;
stored_ops++;
if (stored_bytes < MAX_SIZE)
- {
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
- return;
- }
- crc->key = *key;
- crc->esize = size;
- memcpy (crc->data, data, size);
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+ crc->phase = RP_PUT;
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_remove (datastore,
+ key,
+ size,
+ data,
+ 1, 1, TIMEOUT,
+ &remove_next,
+ crc));
}
static char data[65536];
int i;
int k;
+ char gstr[128];
ok = (int) crc->phase;
switch (crc->phase)
if (i > 255)
memset (data, i - 255, size / 2);
data[0] = k;
- GNUNET_DATASTORE_put (datastore,
- 0,
- &key,
- size,
- data,
- i+1,
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100),
- i,
- GNUNET_TIME_relative_to_absolute
- (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
- 1, 1, TIMEOUT,
- &check_success,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_put (datastore,
+ 0,
+ &key,
+ size,
+ data,
+ i+1,
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100),
+ i, 0,
+ GNUNET_TIME_relative_to_absolute
+ (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
+ 1, 1, TIMEOUT,
+ &check_success,
+ crc));
break;
case RP_CUT:
/* trim down below MAX_SIZE again */
- GNUNET_DATASTORE_get_random (datastore,
- 1, 1, TIMEOUT,
- &delete_value,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_for_replication (datastore,
+ 1, 1, TIMEOUT,
+ &delete_value,
+ crc));
break;
case RP_REPORT:
printf (
"Stored %llu kB / %lluk ops / %llu ops/s\n",
stored_bytes / 1024, /* used size in k */
stored_ops / 1024, /* total operations (in k) */
- 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).value));
+ 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value));
crc->phase = RP_PUT;
crc->j = 0;
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case RP_DONE:
+ GNUNET_snprintf (gstr, sizeof (gstr),
+ "PUT operations in %s-datastore",
+ plugin_name);
+ if (crc->i == ITERATIONS)
+ GAUGER ("DATASTORE", gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "op/s");
GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
GNUNET_free (crc);
ok = 0;
break;
+ case RP_ERROR:
+ GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+ GNUNET_free (crc);
+ ok = 1;
+ break;
default:
GNUNET_assert (0);
}
}
-
static void
run_tests (void *cls,
int success,
GNUNET_free (crc);
return;
}
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
struct CpsRunContext *crc;
static GNUNET_HashCode zkey;
- datastore = GNUNET_DATASTORE_connect (cfg, sched);
+ datastore = GNUNET_DATASTORE_connect (cfg);
start_time = GNUNET_TIME_absolute_get ();
crc = GNUNET_malloc(sizeof(struct CpsRunContext));
- crc->sched = sched;
crc->cfg = cfg;
crc->phase = RP_PUT;
if (NULL ==
GNUNET_DATASTORE_put (datastore, 0,
&zkey, 4, "TEST",
GNUNET_BLOCK_TYPE_TEST,
- 0, 0, GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_SECONDS),
+ 0, 0, 0, GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_SECONDS),
0, 1, GNUNET_TIME_UNIT_MINUTES,
&run_tests, crc))
{
static int
check ()
{
- pid_t pid;
+ struct GNUNET_OS_Process *proc;
char cfg_name[128];
char *const argv[] = {
"perf-datastore-api",
sizeof (cfg_name),
"test_datastore_api_data_%s.conf",
plugin_name);
- pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
#endif
"-c", cfg_name, NULL);
+ GNUNET_assert (NULL != proc);
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "perf-datastore-api", "nohelp",
options, &run, NULL);
- if (0 != PLIBC_KILL (pid, SIGTERM))
+ sleep (1); /* give datastore chance to process 'DROP' */
+ if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
- GNUNET_OS_process_wait(pid);
+ GNUNET_OS_process_wait (proc);
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
return ok;
}
main (int argc, char *argv[])
{
int ret;
- const char *pos;
+ char *pos;
char dir_name[128];
+ sleep (1);
/* 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;
GNUNET_snprintf (dir_name,
sizeof (dir_name),
#endif
NULL);
ret = check ();
+ if (pos != plugin_name)
+ pos[0] = '.';
#if REPORT_ID
fprintf (stderr, "\n");
#endif
projects / oweals / gnunet.git / blobdiff