From 502af2167f7c218366666ca4944bd7cc54b5b19a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 15 Aug 2011 21:46:35 +0000 Subject: indentation --- src/datastore/test_datastore_api_management.c | 309 ++++++++++++-------------- 1 file changed, 142 insertions(+), 167 deletions(-) (limited to 'src/datastore/test_datastore_api_management.c') diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index ca1df2cf9..b2146a915 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -47,7 +47,7 @@ static struct GNUNET_TIME_Absolute now; static int ok; -static const char* plugin_name; +static const char *plugin_name; static size_t get_size (int i) @@ -59,34 +59,35 @@ get_size (int i) static const void * get_data (int i) { - static char buf[60000]; + static char buf[60000]; + memset (buf, i, 8 + 8 * (i % 256)); return buf; } static int -get_type(int i) +get_type (int i) { return 1; } -static int +static int get_priority (int i) { - return i+1; + return i + 1; } static int -get_anonymity(int i) +get_anonymity (int i) { return i; } -static struct GNUNET_TIME_Absolute +static struct GNUNET_TIME_Absolute get_expiration (int i) { struct GNUNET_TIME_Absolute av; @@ -96,12 +97,12 @@ get_expiration (int i) } enum RunPhase - { - RP_PUT, - RP_GET, - RP_DONE, - RP_GET_FAIL - }; +{ + RP_PUT, + RP_GET, + RP_DONE, + RP_GET_FAIL +}; struct CpsRunContext @@ -117,77 +118,70 @@ struct CpsRunContext static void -run_continuation (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); static void -check_success (void *cls, - int success, - const char *msg) +check_success (void *cls, int success, const char *msg) { struct CpsRunContext *crc = cls; + if (GNUNET_OK != success) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "%s\n", msg); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", msg); GNUNET_assert (GNUNET_OK == success); GNUNET_free_non_null (crc->data); crc->data = NULL; GNUNET_SCHEDULER_add_continuation (&run_continuation, - crc, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } -static void +static void check_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) + 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; int i; if (NULL == key) - { - crc->phase = RP_GET_FAIL; - GNUNET_SCHEDULER_add_continuation (&run_continuation, - crc, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - return; - } + { + crc->phase = RP_GET_FAIL; + GNUNET_SCHEDULER_add_continuation (&run_continuation, + crc, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + return; + } i = crc->i; GNUNET_assert (size == get_size (i)); - GNUNET_assert (0 == memcmp (data, get_data(i), size)); + 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.abs_value == get_expiration(i).abs_value); + GNUNET_assert (anonymity == get_anonymity (i)); + GNUNET_assert (expiration.abs_value == get_expiration (i).abs_value); crc->offset++; crc->i--; if (crc->i == 0) crc->phase = RP_DONE; GNUNET_SCHEDULER_add_continuation (&run_continuation, - crc, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } -static void +static void check_nothing (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) + 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; @@ -195,143 +189,125 @@ check_nothing (void *cls, if (0 == --crc->i) crc->phase = RP_DONE; GNUNET_SCHEDULER_add_continuation (&run_continuation, - crc, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } static void -run_continuation (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct CpsRunContext *crc = cls; + ok = (int) crc->phase; switch (crc->phase) - { - case RP_PUT: + { + case RP_PUT: #if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Executing `%s' number %u\n", - "PUT", - crc->i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Executing `%s' number %u\n", "PUT", crc->i); #endif - GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); - GNUNET_DATASTORE_put (datastore, - 0, - &crc->key, - get_size (crc->i), - get_data (crc->i), - get_type (crc->i), - get_priority (crc->i), - get_anonymity (crc->i), - 0, - get_expiration (crc->i), - 1, 1, TIMEOUT, - &check_success, - crc); - crc->i++; - if (crc->i == ITERATIONS) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Sleeping to give datastore time to clean up\n"); - sleep (1); - crc->phase = RP_GET; - crc->i--; - } - break; - case RP_GET: + GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); + GNUNET_DATASTORE_put (datastore, + 0, + &crc->key, + get_size (crc->i), + get_data (crc->i), + get_type (crc->i), + get_priority (crc->i), + get_anonymity (crc->i), + 0, + get_expiration (crc->i), + 1, 1, TIMEOUT, &check_success, crc); + crc->i++; + if (crc->i == ITERATIONS) + { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Sleeping to give datastore time to clean up\n"); + sleep (1); + crc->phase = RP_GET; + crc->i--; + } + break; + case RP_GET: #if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Executing `%s' number %u\n", - "GET", - crc->i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Executing `%s' number %u\n", "GET", crc->i); #endif - GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); - GNUNET_DATASTORE_get_key (datastore, - crc->offset++, - &crc->key, - get_type (crc->i), - 1, 1, TIMEOUT, - &check_value, - crc); - break; - case RP_GET_FAIL: + GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); + GNUNET_DATASTORE_get_key (datastore, + crc->offset++, + &crc->key, + get_type (crc->i), + 1, 1, TIMEOUT, &check_value, crc); + break; + case RP_GET_FAIL: #if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Executing `%s' number %u\n", - "GET(f)", - crc->i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Executing `%s' number %u\n", "GET(f)", crc->i); #endif - GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); - GNUNET_DATASTORE_get_key (datastore, - crc->offset++, - &crc->key, - get_type (crc->i), - 1, 1, TIMEOUT, - &check_nothing, - crc); - break; - case RP_DONE: - GNUNET_assert (0 == crc->i); + GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); + GNUNET_DATASTORE_get_key (datastore, + crc->offset++, + &crc->key, + get_type (crc->i), + 1, 1, TIMEOUT, &check_nothing, crc); + break; + case RP_DONE: + GNUNET_assert (0 == crc->i); #if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Finished, disconnecting\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished, disconnecting\n"); #endif - GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES); - GNUNET_free (crc); - ok = 0; - } + GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES); + GNUNET_free (crc); + ok = 0; + } } static void -run_tests (void *cls, - int success, - const char *msg) +run_tests (void *cls, int success, const char *msg) { struct CpsRunContext *crc = cls; if (success != GNUNET_YES) - { - fprintf (stderr, - "Test 'put' operation failed with error `%s' database likely not setup, skipping test.", - msg); - GNUNET_free (crc); - return; - } + { + 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); + crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } static void run (void *cls, char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct CpsRunContext *crc; static GNUNET_HashCode zkey; - crc = GNUNET_malloc(sizeof(struct CpsRunContext)); + crc = GNUNET_malloc (sizeof (struct CpsRunContext)); crc->cfg = cfg; crc->phase = RP_PUT; now = GNUNET_TIME_absolute_get (); 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"); - GNUNET_free (crc); - ok = 1; - } + &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"); + GNUNET_free (crc); + ok = 1; + } } @@ -341,7 +317,8 @@ check () { struct GNUNET_OS_Process *proc; char cfg_name[128]; - char *const argv[] = { + + char *const argv[] = { "test-datastore-api-management", "-c", cfg_name, @@ -354,25 +331,24 @@ check () GNUNET_GETOPT_OPTION_END }; GNUNET_snprintf (cfg_name, - sizeof (cfg_name), - "test_datastore_api_data_%s.conf", - plugin_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", + "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, "test-datastore-api-management", "nohelp", options, &run, NULL); - sleep (1); /* give datastore chance to process 'DROP' request */ + sleep (1); /* give datastore chance to process 'DROP' request */ if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - ok = 1; - } + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + ok = 1; + } GNUNET_OS_process_wait (proc); GNUNET_OS_process_close (proc); proc = NULL; @@ -385,24 +361,23 @@ int main (int argc, char *argv[]) { int ret; - + 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, "."))) + 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), - "/tmp/test-gnunet-datastore-%s", - plugin_name); + sizeof (dir_name), + "/tmp/test-gnunet-datastore-%s", plugin_name); GNUNET_DISK_directory_remove (dir_name); GNUNET_log_setup ("test-datastore-api-management", #if VERBOSE -- cgit v1.2.3