From 559f169aa2393360f50c85a76221f0ae33dece70 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 1 Dec 2006 09:02:17 +1100 Subject: [PATCH] - fixed the sort function to include the exsting data - use numbers below 1000 in test code to make debug easier - use ctdb_connect_wait() (This used to be ctdb commit 216850e63e335de7d7cbe6c351d948bb8f1565e7) --- ctdb/ctdb_test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ctdb/ctdb_test.c b/ctdb/ctdb_test.c index 452fa558b1f..0d4df26f9f0 100644 --- a/ctdb/ctdb_test.c +++ b/ctdb/ctdb_test.c @@ -50,10 +50,14 @@ static int sort_func(struct ctdb_call *call) return CTDB_ERR_NOMEM; } call->new_data->dsize = call->record_data.dsize + call->call_data->dsize; + memcpy(call->new_data->dptr, + call->record_data.dptr, call->record_data.dsize); memcpy(call->new_data->dptr+call->record_data.dsize, call->call_data->dptr, call->call_data->dsize); + qsort(call->new_data->dptr, call->new_data->dsize / sizeof(int), sizeof(int), (comparison_fn_t)int_compare); + return 0; } @@ -156,21 +160,17 @@ int main(int argc, const char *argv[]) /* start the protocol running */ ret = ctdb_start(ctdb); + + /* wait until all nodes are connected (should not be needed + outide of test code) */ + ctdb_connect_wait(ctdb); key.dptr = "test"; key.dsize = strlen("test")+1; - -#if 1 - /* loop for testing */ - while (1) { - event_loop_once(ev); - } -#endif - /* add some random data */ for (i=0;i<100;i++) { - int v = random(); + int v = random() % 1000; data.dptr = (uint8_t *)&v; data.dsize = sizeof(v); ret = ctdb_call(ctdb, key, FUNC_SORT, &data, NULL); -- 2.47.3