static void
-check_success (void *cls, int success, const char *msg)
+check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg)
{
struct CpsRunContext *crc = cls;
return;
}
#if REPORT_ID
- fprintf (stderr, "I");
+ FPRINTF (stderr, "%s", "I");
#endif
stored_bytes += crc->size;
stored_ops++;
else
crc->phase = RP_CUT;
}
- GNUNET_SCHEDULER_add_continuation (&run_continuation,
- crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
*
* @param cls closure
* @param success GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
+ * by the datacache at this time, zero for unknown
* @param msg NULL on success, otherwise an error message
*/
static void
-remove_next (void *cls, int success, const char *msg)
+remove_next (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg)
{
struct CpsRunContext *crc = cls;
return;
}
#if REPORT_ID
- fprintf (stderr, "D");
+ FPRINTF (stderr, "%s", "D");
#endif
GNUNET_assert (GNUNET_OK == success);
GNUNET_SCHEDULER_add_now (&run_continuation, crc);
static void
-delete_value (void *cls,
- const GNUNET_HashCode * key,
- size_t size,
- const void *data,
- enum GNUNET_BLOCK_Type type,
- uint32_t priority,
- uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration, uint64_t uid)
+delete_value (void *cls, const GNUNET_HashCode * key, size_t size,
+ const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
+ uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+ uint64_t uid)
{
struct CpsRunContext *crc = cls;
if (stored_bytes < MAX_SIZE)
crc->phase = RP_PUT;
GNUNET_assert (NULL !=
- GNUNET_DATASTORE_remove (datastore,
- key,
- size,
- data,
- 1, 1, TIMEOUT, &remove_next, crc));
+ GNUNET_DATASTORE_remove (datastore, key, size, data, 1, 1,
+ TIMEOUT, &remove_next, crc));
}
memset (data, i - 255, size / 2);
data[0] = k;
GNUNET_assert (NULL !=
- GNUNET_DATASTORE_put (datastore,
- 0,
- &key,
- size,
- data,
- i + 1,
+ GNUNET_DATASTORE_put (datastore, 0, &key, size, data, i + 1,
GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_WEAK, 100), i,
0,
case RP_CUT:
/* trim down below MAX_SIZE again */
GNUNET_assert (NULL !=
- GNUNET_DATASTORE_get_for_replication (datastore,
- 1, 1, TIMEOUT,
- &delete_value, crc));
+ GNUNET_DATASTORE_get_for_replication (datastore, 1, 1,
+ TIMEOUT, &delete_value,
+ crc));
break;
case RP_REPORT:
printf (
(start_time).rel_value));
crc->phase = RP_PUT;
crc->j = 0;
- GNUNET_SCHEDULER_add_continuation (&run_continuation,
- crc,
+ GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case RP_DONE:
GNUNET_snprintf (gstr, sizeof (gstr), "DATASTORE-%s", plugin_name);
if ((crc->i == ITERATIONS) && (stored_ops > 0))
- GAUGER (gstr,
- "PUT operation duration",
+ GAUGER (gstr, "PUT operation duration",
GNUNET_TIME_absolute_get_duration (start_time).rel_value /
stored_ops, "ms/operation");
GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
static void
-run_tests (void *cls, int success, const char *msg)
+run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg)
{
struct CpsRunContext *crc = cls;
if (success != GNUNET_YES)
{
- fprintf (stderr,
+ FPRINTF (stderr,
"Test 'put' operation failed with error `%s' database likely not setup, skipping test.",
msg);
GNUNET_free (crc);
return;
}
- GNUNET_SCHEDULER_add_continuation (&run_continuation,
- crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct CpsRunContext *crc;
static GNUNET_HashCode zkey;
crc->cfg = cfg;
crc->phase = RP_PUT;
if (NULL ==
- GNUNET_DATASTORE_put (datastore, 0,
- &zkey, 4, "TEST",
- GNUNET_BLOCK_TYPE_TEST,
- 0, 0, 0,
+ GNUNET_DATASTORE_put (datastore, 0, &zkey, 4, "TEST",
+ GNUNET_BLOCK_TYPE_TEST, 0, 0, 0,
GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_UNIT_SECONDS), 0, 1,
GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
{
- fprintf (stderr, "Test 'put' operation failed.\n");
+ FPRINTF (stderr, "%s", "Test 'put' operation failed.\n");
ok = 1;
GNUNET_free (crc);
}
GNUNET_GETOPT_OPTION_END
};
- GNUNET_snprintf (cfg_name,
- sizeof (cfg_name),
+ GNUNET_snprintf (cfg_name, sizeof (cfg_name),
"test_datastore_api_data_%s.conf", plugin_name);
- proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ proc =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfg_name, NULL);
+ "-c", cfg_name, NULL);
GNUNET_assert (NULL != proc);
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "perf-datastore-api", "nohelp",
- options, &run, NULL);
+ 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))
{
else
pos = (char *) plugin_name;
- GNUNET_snprintf (dir_name,
- sizeof (dir_name),
- "/tmp/test-gnunet-datastore-%s", plugin_name);
+ GNUNET_snprintf (dir_name, sizeof (dir_name), "/tmp/test-gnunet-datastore-%s",
+ plugin_name);
GNUNET_DISK_directory_remove (dir_name);
GNUNET_log_setup ("perf-datastore-api",
#if VERBOSE
if (pos != plugin_name)
pos[0] = '.';
#if REPORT_ID
- fprintf (stderr, "\n");
+ FPRINTF (stderr, "%s", "\n");
#endif
GNUNET_DISK_directory_remove (dir_name);
return ret;