#define VERBOSE GNUNET_NO
-#define START_DATASTORE GNUNET_NO
+#define START_DATASTORE GNUNET_YES
/**
* How long until we give up on transmitting the message?
{
struct GNUNET_TIME_Absolute av;
- av.value = now.value + 20000000 - i * 1000;
+ av.abs_value = now.abs_value + 20000000 - i * 1000;
return av;
}
enum RunPhase
{
RP_DONE = 0,
- RP_PUT,
- RP_GET,
- RP_DEL,
- RP_DO_DEL,
- RP_DELVALIDATE,
- RP_RESERVE,
- RP_PUT_MULTIPLE,
- RP_PUT_MULTIPLE_NEXT,
- RP_GET_MULTIPLE,
- RP_GET_MULTIPLE_NEXT,
- RP_GET_MULTIPLE_DONE,
- RP_UPDATE,
- RP_UPDATE_VALIDATE,
- RP_UPDATE_DONE,
+ RP_PUT = 1,
+ RP_GET = 2,
+ RP_DEL = 3,
+ RP_DO_DEL = 4,
+ RP_DELVALIDATE = 5,
+ RP_RESERVE = 6,
+ RP_PUT_MULTIPLE = 7,
+ RP_PUT_MULTIPLE_NEXT = 8,
+ RP_GET_MULTIPLE = 9,
+ RP_GET_MULTIPLE_NEXT = 10,
+ RP_UPDATE = 11,
+ RP_UPDATE_VALIDATE = 12,
RP_ERROR
};
GNUNET_HashCode key;
int i;
int rid;
- struct GNUNET_SCHEDULER_Handle *sched;
const struct GNUNET_CONFIGURATION_Handle *cfg;
void *data;
size_t size;
enum RunPhase phase;
- unsigned long long uid;
+ uint64_t uid;
+ uint64_t offset;
+ uint64_t first_uid;
};
const char *msg)
{
struct CpsRunContext *crc = cls;
+
if (GNUNET_OK != success)
{
- ok = 42;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "%s\n", msg);
- GNUNET_SCHEDULER_shutdown (crc->sched);
- return;
+ "Operation %d/%d not successfull: `%s'\n",
+ crc->phase,
+ crc->i,
+ msg);
+ crc->phase = RP_ERROR;
}
GNUNET_free_non_null (crc->data);
crc->data = NULL;
- 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 (0 >= success)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "%s\n", msg);
+ "Error obtaining reservation: `%s'\n",
+ msg);
GNUNET_assert (0 < success);
crc->rid = success;
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
check_value (void *cls,
const GNUNET_HashCode * key,
- uint32_t size,
+ 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 GNUNET_TIME_Absolute expiration,
+ uint64_t uid)
{
struct CpsRunContext *crc = cls;
int i;
- if (key == NULL)
- {
- if (crc->i == 0)
- {
- crc->phase = RP_DEL;
- crc->i = ITERATIONS;
- }
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
i = crc->i;
+#if 0
+ fprintf (stderr,
+ "Check value got `%s' of size %u, type %d, expire %llu\n",
+ GNUNET_h2s (key),
+ (unsigned int) size,
+ type,
+ (unsigned long long) expiration.abs_value);
+ fprintf (stderr,
+ "Check value iteration %d wants size %u, type %d, expire %llu\n",
+ i,
+ (unsigned int) get_size (i),
+ get_type (i),
+ (unsigned long long) get_expiration(i).abs_value);
+#endif
GNUNET_assert (size == get_size (i));
GNUNET_assert (0 == memcmp (data, get_data(i), size));
GNUNET_assert (type == get_type (i));
GNUNET_assert (priority == get_priority (i));
GNUNET_assert (anonymity == get_anonymity(i));
- GNUNET_assert (expiration.value == get_expiration(i).value);
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+ GNUNET_assert (expiration.abs_value == get_expiration(i).abs_value);
+ crc->offset++;
+ if (crc->i == 0)
+ {
+ crc->phase = RP_DEL;
+ crc->i = ITERATIONS;
+ }
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
delete_value (void *cls,
- const GNUNET_HashCode * key,
- uint32_t size,
+ const GNUNET_HashCode *key,
+ size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
uint32_t priority,
expiration, uint64_t uid)
{
struct CpsRunContext *crc = cls;
- if (key == NULL)
- {
- if (crc->data == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Content %u not found!\n",
- crc->i);
- crc->phase = RP_ERROR;
- }
- else
- {
- crc->phase = RP_DO_DEL;
- }
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
+
GNUNET_assert (crc->data == NULL);
+ GNUNET_assert (NULL != key);
crc->size = size;
crc->key = *key;
crc->data = GNUNET_malloc (size);
memcpy (crc->data, data, size);
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+ crc->phase = RP_DO_DEL;
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
check_nothing (void *cls,
- const GNUNET_HashCode * key,
- uint32_t size,
+ const GNUNET_HashCode *key,
+ size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
uint32_t priority,
expiration, uint64_t uid)
{
struct CpsRunContext *crc = cls;
+
GNUNET_assert (key == NULL);
if (crc->i == 0)
- {
- crc->phase = RP_RESERVE;
- }
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
+ crc->phase = RP_RESERVE;
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
crc,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
check_multiple (void *cls,
const GNUNET_HashCode * key,
- uint32_t size,
+ size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
uint32_t priority,
{
struct CpsRunContext *crc = cls;
- if (key == NULL)
- {
- if (crc->phase != RP_GET_MULTIPLE_DONE)
- {
- GNUNET_break (0);
- crc->phase = RP_ERROR;
- }
- else
- {
- crc->phase = RP_UPDATE;
- }
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
+ GNUNET_assert (key != NULL);
switch (crc->phase)
{
case RP_GET_MULTIPLE:
crc->phase = RP_GET_MULTIPLE_NEXT;
+ crc->first_uid = uid;
+ crc->offset++;
break;
case RP_GET_MULTIPLE_NEXT:
- crc->phase = RP_GET_MULTIPLE_DONE;
- break;
- case RP_GET_MULTIPLE_DONE:
- /* do not advance further */
+ GNUNET_assert (uid != crc->first_uid);
+ crc->phase = RP_UPDATE;
break;
default:
GNUNET_break (0);
+ crc->phase = RP_ERROR;
break;
}
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Test in phase %u\n", crc->phase);
-#endif
if (priority == get_priority (42))
crc->uid = uid;
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
static void
check_update (void *cls,
const GNUNET_HashCode * key,
- uint32_t size,
+ size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
uint32_t priority,
{
struct CpsRunContext *crc = cls;
- if (key == NULL)
- {
- GNUNET_assert (crc->phase == RP_UPDATE_DONE);
- crc->phase = RP_DONE;
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
+ GNUNET_assert (key != NULL);
if ( (anonymity == get_anonymity (42)) &&
(size == get_size (42)) &&
(priority == get_priority (42) + 100) )
+ crc->phase = RP_DONE;
+ else
{
- crc->phase = RP_UPDATE_DONE;
+ GNUNET_assert (size == get_size (43));
+ crc->offset++;
}
- else
- GNUNET_assert (size == get_size (43));
- GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
get_type (crc->i),
get_priority (crc->i),
get_anonymity (crc->i),
+ 0,
get_expiration (crc->i),
1, 1, TIMEOUT,
&check_success,
crc->i);
#endif
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
- GNUNET_DATASTORE_get (datastore,
- &crc->key,
- get_type (crc->i),
- 1, 1, TIMEOUT,
- &check_value,
- crc);
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (crc->i),
+ 1, 1, TIMEOUT,
+ &check_value,
+ crc);
break;
case RP_DEL:
crc->i--;
#endif
crc->data = NULL;
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
- GNUNET_DATASTORE_get (datastore,
- &crc->key,
- get_type (crc->i),
- 1, 1, TIMEOUT,
- &delete_value,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (crc->i),
+ 1, 1, TIMEOUT,
+ &delete_value,
+ crc));
break;
case RP_DO_DEL:
#if VERBOSE
{
crc->phase = RP_DEL;
}
- GNUNET_DATASTORE_remove (datastore,
- &crc->key,
- crc->size,
- crc->data,
- 1, 1, TIMEOUT,
- &check_success,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_remove (datastore,
+ &crc->key,
+ crc->size,
+ crc->data,
+ 1, 1, TIMEOUT,
+ &check_success,
+ crc));
break;
case RP_DELVALIDATE:
crc->i--;
crc->i);
#endif
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
- GNUNET_DATASTORE_get (datastore,
- &crc->key,
- get_type (crc->i),
- 1, 1, TIMEOUT,
- &check_nothing,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (crc->i),
+ 1, 1, TIMEOUT,
+ &check_nothing,
+ crc));
break;
case RP_RESERVE:
crc->phase = RP_PUT_MULTIPLE;
get_type (42),
get_priority (42),
get_anonymity (42),
+ 0,
get_expiration (42),
1, 1, TIMEOUT,
&check_success,
get_type (42),
get_priority (43),
get_anonymity (43),
+ 0,
get_expiration (43),
1, 1, TIMEOUT,
&check_success,
crc);
break;
case RP_GET_MULTIPLE:
- GNUNET_DATASTORE_get (datastore,
- &crc->key,
- get_type (42),
- 1, 1, TIMEOUT,
- &check_multiple,
- crc);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (42),
+ 1, 1, TIMEOUT,
+ &check_multiple,
+ crc));
break;
case RP_GET_MULTIPLE_NEXT:
- case RP_GET_MULTIPLE_DONE:
- GNUNET_assert (0);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (42),
+ 1, 1, TIMEOUT,
+ &check_multiple,
+ crc));
break;
case RP_UPDATE:
GNUNET_assert (crc->uid > 0);
crc);
break;
case RP_UPDATE_VALIDATE:
- GNUNET_DATASTORE_get (datastore,
- &crc->key,
- get_type (42),
- 1, 1, TIMEOUT,
- &check_update,
- crc);
- break;
- case RP_UPDATE_DONE:
- GNUNET_assert (0);
+ GNUNET_assert (NULL !=
+ GNUNET_DATASTORE_get_key (datastore,
+ crc->offset,
+ &crc->key,
+ get_type (42),
+ 1, 1, TIMEOUT,
+ &check_update,
+ crc));
break;
case RP_DONE:
#if VERBOSE
}
+static void
+run_tests (void *cls,
+ int32_t success,
+ const char *msg)
+{
+ struct CpsRunContext *crc = cls;
+
+ switch (success)
+ {
+ case GNUNET_YES:
+ GNUNET_SCHEDULER_add_continuation (&run_continuation,
+ crc,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ return;
+ case GNUNET_NO:
+ fprintf (stderr,
+ "Test 'put' operation failed, key already exists (!?)\n");
+ GNUNET_free (crc);
+ return;
+ case GNUNET_SYSERR:
+ fprintf (stderr,
+ "Test 'put' operation failed with error `%s' database likely not setup, skipping test.\n",
+ msg);
+ GNUNET_free (crc);
+ return;
+ default:
+ GNUNET_assert (0);
+ }
+}
+
+
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;
crc = GNUNET_malloc(sizeof(struct CpsRunContext));
- crc->sched = sched;
crc->cfg = cfg;
crc->phase = RP_PUT;
now = GNUNET_TIME_absolute_get ();
- datastore = GNUNET_DATASTORE_connect (cfg, sched);
- GNUNET_SCHEDULER_add_continuation (crc->sched,
- &run_continuation,
- crc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-
+ datastore = GNUNET_DATASTORE_connect (cfg);
+ if (NULL ==
+ 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");
+ ok = 1;
+ GNUNET_free (crc);
+ }
}
-
static int
check ()
{
char cfg_name[128];
#if START_DATASTORE
- pid_t pid;
+ struct GNUNET_OS_Process *proc;
#endif
char *const argv[] = {
"test-datastore-api",
"test_datastore_api_data_%s.conf",
plugin_name);
#if START_DATASTORE
- 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);
#endif
+ GNUNET_assert (NULL != proc);
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "test-datastore-api", "nohelp",
options, &run, NULL);
#if START_DATASTORE
- if (0 != PLIBC_KILL (pid, SIGTERM))
+ sleep (1); /* give datastore chance to receive 'DROP' request */
+ 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;
#endif
if (ok != 0)
fprintf (stderr, "Missed some testcases: %u\n", 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] = '.';
GNUNET_DISK_directory_remove (dir_name);
return ret;
}
projects / oweals / gnunet.git / blobdiff