#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-static struct GNUNET_DATASTORE_Handle *datastore;
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
+static struct GNUNET_DATASTORE_Handle *datastore;
+
/**
* Target datastore size (in bytes).
- * <p>
- * Example impact of total size on the reported number
- * of operations (insert and delete) per second (once
- * roughly stabilized -- this is not "sound" experimental
- * data but just a rough idea) for a particular machine:
- * <pre>
- * 4: 60 at 7k ops total
- * 8: 50 at 3k ops total
- * 16: 48 at 8k ops total
- * 32: 46 at 8k ops total
- * 64: 61 at 9k ops total
- * 128: 89 at 9k ops total
- * 4092: 11 at 383k ops total (12 GB stored, 14.8 GB DB size on disk, 2.5 GB reported)
- * </pre>
- * Pure insertion performance into an empty DB initially peaks
- * at about 400 ops. The performance seems to drop especially
- * once the existing (fragmented) ISAM space is filled up and
- * the DB needs to grow on disk. This could be explained with
- * ISAM looking more carefully for defragmentation opportunities.
- * <p>
- * MySQL disk space overheads (for otherwise unused database when
- * run with 128 MB target data size; actual size 651 MB, useful
- * data stored 520 MB) are quite large in the range of 25-30%.
- * <p>
- * This kind of processing seems to be IO bound (system is roughly
- * at 90% wait, 10% CPU). This is with MySQL 5.0.
- *
*/
-#define MAX_SIZE 1024LL * 1024 * 16
+#define MAX_SIZE 1024LL * 1024 * 4
/**
* Report progress outside of major reports? Should probably be GNUNET_YES if
* size is > 16 MB.
*/
-#define REPORT_ID GNUNET_NO
+#define REPORT_ID GNUNET_YES
/**
- * Number of put operations equivalent to 1/10th of MAX_SIZE
+ * Number of put operations equivalent to 1/3rd of MAX_SIZE
*/
-#define PUT_10 MAX_SIZE / 32 / 1024 / 10
-
-/**
- * Progress report frequency. 1/10th of a put operation block.
- */
-#define REP_FREQ PUT_10 / 10
+#define PUT_10 MAX_SIZE / 32 / 1024 / 3
/**
* Total number of iterations (each iteration doing
* PUT_10 put operations); we report full status every
* 10 iterations. Abort with CTRL-C.
*/
-#define ITERATIONS 100
+#define ITERATIONS 8
static unsigned long long stored_bytes;
struct CpsRunContext
{
struct GNUNET_SCHEDULER_Handle *sched;
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
enum RunPhase phase;
int j;
unsigned long long size;
int success,
const char *msg)
{
- static int ic;
-
struct CpsRunContext *crc = cls;
if (GNUNET_OK != success)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%s\n", msg);
GNUNET_assert (GNUNET_OK == success);
- ic++;
#if REPORT_ID
- if (ic % REP_FREQ == 0)
- fprintf (stderr, "I");
+ fprintf (stderr, "I");
#endif
stored_bytes += crc->size;
stored_ops++;
crc->phase = RP_CUT;
}
GNUNET_SCHEDULER_add_continuation (crc->sched,
- GNUNET_NO,
&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
int success,
const char *msg)
{
- static int dc;
- dc++;
+ struct CpsRunContext *crc = cls;
+
#if REPORT_ID
- if (dc % REP_FREQ == 0)
- fprintf (stderr, "D");
+ fprintf (stderr, "D");
#endif
GNUNET_assert (GNUNET_OK == success);
+ GNUNET_SCHEDULER_add_continuation (crc->sched,
+ &run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
{
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,
- TIMEOUT);
+ crc);
}
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
{
struct CpsRunContext *crc = cls;
- if (stored_bytes < MAX_SIZE)
- return;
if (key == NULL)
{
- crc->phase = RP_REPORT;
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- GNUNET_NO,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ 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;
}
- 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_SCHEDULER_add_after (crc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
- GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
- &do_delete,
- crc);
+ GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
}
&key,
size,
data,
- i,
+ 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))),
- TIMEOUT,
+ 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,
- TIMEOUT);
+ crc);
break;
case RP_REPORT:
- size = 0;
printf (
#if REPORT_ID
"\n"
#endif
"Stored %llu kB / %lluk ops / %llu ops/s\n",
stored_bytes / 1024, /* used size in k */
- (stored_ops * 2 - stored_entries) / 1024, /* total operations (in k) */
- 1000 * (stored_ops * 2 - stored_entries) / (1 + GNUNET_TIME_absolute_get_duration(start_time).value)); /* operations per second */
+ stored_ops / 1024, /* total operations (in k) */
+ 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).value));
crc->phase = RP_PUT;
+ crc->j = 0;
GNUNET_SCHEDULER_add_continuation (crc->sched,
- GNUNET_NO,
&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case RP_DONE:
GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+ GNUNET_free (crc);
ok = 0;
break;
+ default:
+ GNUNET_assert (0);
}
}
run (void *cls,
struct GNUNET_SCHEDULER_Handle *sched,
char *const *args,
- const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct CpsRunContext *crc;
datastore = GNUNET_DATASTORE_connect (cfg, sched);
-
+ start_time = GNUNET_TIME_absolute_get ();
crc = GNUNET_malloc(sizeof(struct CpsRunContext));
crc->sched = sched;
crc->cfg = cfg;
crc->phase = RP_PUT;
GNUNET_SCHEDULER_add_continuation (crc->sched,
- GNUNET_NO,
&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
- pid = GNUNET_OS_start_process ("gnunet-service-datastore",
- "gnunet-service-datastore",
+ pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
#endif
"-c", "test_datastore_api_data.conf", NULL);
- sleep (1);
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "perf-datastore-api", "nohelp",
options, &run, NULL);
{
int ret;
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
GNUNET_log_setup ("perf-datastore-api",
#if VERBOSE
- "DEBUG",
+ "DEBUG",
#else
"WARNING",
#endif
NULL);
ret = check ();
-
+#if REPORT_ID
+ fprintf (stderr, "\n");
+#endif
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
return ret;
}
projects / oweals / gnunet.git / blobdiff