RP_DONE = 0,
RP_PUT,
RP_CUT,
- RP_REPORT
+ RP_REPORT,
+ RP_ERROR
};
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++;
{
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
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,
expiration, uint64_t uid)
{
struct CpsRunContext *crc = cls;
-
+
GNUNET_assert (NULL != key);
stored_ops++;
stored_bytes -= size;
break;
case RP_DONE:
GNUNET_snprintf (gstr, sizeof (gstr),
- "PUT operations in %s-datastore",
+ "DATASTORE-%s",
plugin_name);
- if (crc->i == ITERATIONS)
- GAUGER ("DATASTORE", gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "op/s");
+ if ( (crc->i == ITERATIONS) &&
+ (stored_ops > 0) )
+ GAUGER (gstr,
+ "PUT operation duration",
+ GNUNET_TIME_absolute_get_duration(start_time).rel_value / stored_ops,
+ "ms/operation");
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);
}
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "perf-datastore-api", "nohelp",
options, &run, NULL);
+ sleep (1); /* give datastore chance to process 'DROP' */
if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
char *pos;
char dir_name[128];
+ sleep (1);
/* determine name of plugin to use */
plugin_name = argv[0];
while (NULL != (pos = strstr(plugin_name, "_")))