hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2013 Remove pointless defines

Browse Source
This commit is contained in:
Johan Wikman
2018-08-14 16:35:59 +03:00
parent 228dcbe0ce
commit 83afcc0388
12 changed files with 99 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/maxscale/debug.h
View File

@ -34,9 +34,6 @@ MXS_BEGIN_DECLS
raise(SIGABRT);} } while (false) raise(SIGABRT);} } while (false)
#define ss_debug(exp) exp #define ss_debug(exp) exp
#define ss_dfprintf fprintf
#define ss_dfflush fflush
#define ss_dfwrite fwrite
#else /* SS_DEBUG */ #else /* SS_DEBUG */
@ -44,9 +41,6 @@ MXS_BEGIN_DECLS
#define ss_info_dassert(exp, info) #define ss_info_dassert(exp, info)
#define ss_debug(exp) #define ss_debug(exp)
#define ss_dfprintf(a, b, ...)
#define ss_dfflush(s)
#define ss_dfwrite(a, b, c, d)
#endif /* SS_DEBUG */ #endif /* SS_DEBUG */

52
server/core/test/test_buffer.cc
View File

@ -323,7 +323,7 @@ void test_compare()
{ {
static const uint8_t data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; static const uint8_t data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
ss_dfprintf(stderr, "testbuffer : testing GWBUF comparisons\n"); fprintf(stderr, "testbuffer : testing GWBUF comparisons\n");
GWBUF* lhs = NULL; GWBUF* lhs = NULL;
GWBUF* rhs = NULL; GWBUF* rhs = NULL;
@ -457,83 +457,83 @@ test1()
size_t buflen; size_t buflen;
/* Single buffer tests */ /* Single buffer tests */
ss_dfprintf(stderr, fprintf(stderr,
"testbuffer : creating buffer with data size %lu bytes", "testbuffer : creating buffer with data size %lu bytes",
size); size);
buffer = gwbuf_alloc(size); buffer = gwbuf_alloc(size);
ss_dfprintf(stderr, "\t..done\nAllocated buffer of size %lu.", size); fprintf(stderr, "\t..done\nAllocated buffer of size %lu.", size);
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "\nBuffer length is now %lu", buflen); fprintf(stderr, "\nBuffer length is now %lu", buflen);
ss_info_dassert(size == buflen, "Incorrect buffer size"); ss_info_dassert(size == buflen, "Incorrect buffer size");
ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty"); ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty");
ss_info_dassert(GWBUF_IS_TYPE_UNDEFINED(buffer), "Buffer type should be undefined"); ss_info_dassert(GWBUF_IS_TYPE_UNDEFINED(buffer), "Buffer type should be undefined");
ss_dfprintf(stderr, "\t..done\nSet a property for the buffer"); fprintf(stderr, "\t..done\nSet a property for the buffer");
gwbuf_add_property(buffer, (char*)"name", (char*)"value"); gwbuf_add_property(buffer, (char*)"name", (char*)"value");
ss_info_dassert(0 == strcmp("value", gwbuf_get_property(buffer, (char*)"name")), ss_info_dassert(0 == strcmp("value", gwbuf_get_property(buffer, (char*)"name")),
"Should now have correct property"); "Should now have correct property");
strcpy((char*)GWBUF_DATA(buffer), "The quick brown fox jumps over the lazy dog"); strcpy((char*)GWBUF_DATA(buffer), "The quick brown fox jumps over the lazy dog");
ss_dfprintf(stderr, "\t..done\nLoad some data into the buffer"); fprintf(stderr, "\t..done\nLoad some data into the buffer");
ss_info_dassert('q' == GWBUF_DATA_CHAR(buffer, 4), "Fourth character of buffer must be 'q'"); ss_info_dassert('q' == GWBUF_DATA_CHAR(buffer, 4), "Fourth character of buffer must be 'q'");
ss_info_dassert(-1 == GWBUF_DATA_CHAR(buffer, 105), "Hundred and fifth character of buffer must return -1"); ss_info_dassert(-1 == GWBUF_DATA_CHAR(buffer, 105), "Hundred and fifth character of buffer must return -1");
ss_info_dassert(0 == GWBUF_IS_SQL(buffer), "Must say buffer is not SQL, as it does not have marker"); ss_info_dassert(0 == GWBUF_IS_SQL(buffer), "Must say buffer is not SQL, as it does not have marker");
strcpy((char*)GWBUF_DATA(buffer), "1234\x03SELECT * FROM sometable"); strcpy((char*)GWBUF_DATA(buffer), "1234\x03SELECT * FROM sometable");
ss_dfprintf(stderr, "\t..done\nLoad SQL data into the buffer"); fprintf(stderr, "\t..done\nLoad SQL data into the buffer");
ss_info_dassert(1 == GWBUF_IS_SQL(buffer), "Must say buffer is SQL, as it does have marker"); ss_info_dassert(1 == GWBUF_IS_SQL(buffer), "Must say buffer is SQL, as it does have marker");
clone = gwbuf_clone(buffer); clone = gwbuf_clone(buffer);
ss_dfprintf(stderr, "\t..done\nCloned buffer"); fprintf(stderr, "\t..done\nCloned buffer");
buflen = GWBUF_LENGTH(clone); buflen = GWBUF_LENGTH(clone);
ss_dfprintf(stderr, "\nCloned buffer length is now %lu", buflen); fprintf(stderr, "\nCloned buffer length is now %lu", buflen);
ss_info_dassert(size == buflen, "Incorrect buffer size"); ss_info_dassert(size == buflen, "Incorrect buffer size");
ss_info_dassert(0 == GWBUF_EMPTY(clone), "Cloned buffer should not be empty"); ss_info_dassert(0 == GWBUF_EMPTY(clone), "Cloned buffer should not be empty");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
gwbuf_free(clone); gwbuf_free(clone);
ss_dfprintf(stderr, "Freed cloned buffer"); fprintf(stderr, "Freed cloned buffer");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
buffer = gwbuf_consume(buffer, bite1); buffer = gwbuf_consume(buffer, bite1);
ss_info_dassert(NULL != buffer, "Buffer should not be null"); ss_info_dassert(NULL != buffer, "Buffer should not be null");
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "Consumed %lu bytes, now have %lu, should have %lu", bite1, buflen, size - bite1); fprintf(stderr, "Consumed %lu bytes, now have %lu, should have %lu", bite1, buflen, size - bite1);
ss_info_dassert((size - bite1) == buflen, "Incorrect buffer size"); ss_info_dassert((size - bite1) == buflen, "Incorrect buffer size");
ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty"); ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
buffer = gwbuf_consume(buffer, bite2); buffer = gwbuf_consume(buffer, bite2);
ss_info_dassert(NULL != buffer, "Buffer should not be null"); ss_info_dassert(NULL != buffer, "Buffer should not be null");
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "Consumed %lu bytes, now have %lu, should have %lu", bite2, buflen, size - bite1 - bite2); fprintf(stderr, "Consumed %lu bytes, now have %lu, should have %lu", bite2, buflen, size - bite1 - bite2);
ss_info_dassert((size - bite1 - bite2) == buflen, "Incorrect buffer size"); ss_info_dassert((size - bite1 - bite2) == buflen, "Incorrect buffer size");
ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty"); ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
buffer = gwbuf_consume(buffer, bite3); buffer = gwbuf_consume(buffer, bite3);
ss_dfprintf(stderr, "Consumed %lu bytes, should have null buffer", bite3); fprintf(stderr, "Consumed %lu bytes, should have null buffer", bite3);
ss_info_dassert(NULL == buffer, "Buffer should be null"); ss_info_dassert(NULL == buffer, "Buffer should be null");
/* Buffer list tests */ /* Buffer list tests */
size = 100000; size = 100000;
buffer = gwbuf_alloc(size); buffer = gwbuf_alloc(size);
ss_dfprintf(stderr, "\t..done\nAllocated buffer of size %lu.", size); fprintf(stderr, "\t..done\nAllocated buffer of size %lu.", size);
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "\nBuffer length is now %lu", buflen); fprintf(stderr, "\nBuffer length is now %lu", buflen);
ss_info_dassert(size == buflen, "Incorrect buffer size"); ss_info_dassert(size == buflen, "Incorrect buffer size");
ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty"); ss_info_dassert(0 == GWBUF_EMPTY(buffer), "Buffer should not be empty");
ss_info_dassert(GWBUF_IS_TYPE_UNDEFINED(buffer), "Buffer type should be undefined"); ss_info_dassert(GWBUF_IS_TYPE_UNDEFINED(buffer), "Buffer type should be undefined");
extra = gwbuf_alloc(size); extra = gwbuf_alloc(size);
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "\t..done\nAllocated extra buffer of size %lu.", size); fprintf(stderr, "\t..done\nAllocated extra buffer of size %lu.", size);
ss_info_dassert(size == buflen, "Incorrect buffer size"); ss_info_dassert(size == buflen, "Incorrect buffer size");
buffer = gwbuf_append(buffer, extra); buffer = gwbuf_append(buffer, extra);
buflen = gwbuf_length(buffer); buflen = gwbuf_length(buffer);
ss_dfprintf(stderr, "\t..done\nAppended extra buffer to original buffer to create list of size %lu", buflen); fprintf(stderr, "\t..done\nAppended extra buffer to original buffer to create list of size %lu", buflen);
ss_info_dassert((size * 2) == gwbuf_length(buffer), "Incorrect size for set of buffers"); ss_info_dassert((size * 2) == gwbuf_length(buffer), "Incorrect size for set of buffers");
buffer = gwbuf_rtrim(buffer, 60000); buffer = gwbuf_rtrim(buffer, 60000);
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "\t..done\nTrimmed 60 bytes from buffer, now size is %lu.", buflen); fprintf(stderr, "\t..done\nTrimmed 60 bytes from buffer, now size is %lu.", buflen);
ss_info_dassert((size - 60000) == buflen, "Incorrect buffer size"); ss_info_dassert((size - 60000) == buflen, "Incorrect buffer size");
buffer = gwbuf_rtrim(buffer, 60000); buffer = gwbuf_rtrim(buffer, 60000);
buflen = GWBUF_LENGTH(buffer); buflen = GWBUF_LENGTH(buffer);
ss_dfprintf(stderr, "\t..done\nTrimmed another 60 bytes from buffer, now size is %lu.", buflen); fprintf(stderr, "\t..done\nTrimmed another 60 bytes from buffer, now size is %lu.", buflen);
ss_info_dassert(100000 == buflen, "Incorrect buffer size"); ss_info_dassert(100000 == buflen, "Incorrect buffer size");
ss_info_dassert(buffer == extra, "The buffer pointer should now point to the extra buffer"); ss_info_dassert(buffer == extra, "The buffer pointer should now point to the extra buffer");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
gwbuf_free(buffer); gwbuf_free(buffer);
/** gwbuf_clone_all test */ /** gwbuf_clone_all test */
size_t headsize = 10; size_t headsize = 10;

10
server/core/test/test_dcb.cc
View File

@ -52,21 +52,21 @@ test1()
DCB *dcb; DCB *dcb;
SERV_LISTENER dummy; SERV_LISTENER dummy;
/* Single buffer tests */ /* Single buffer tests */
ss_dfprintf(stderr, "testdcb : creating buffer with type DCB_ROLE_INTERNAL"); fprintf(stderr, "testdcb : creating buffer with type DCB_ROLE_INTERNAL");
dcb = dcb_alloc(DCB_ROLE_INTERNAL, &dummy); dcb = dcb_alloc(DCB_ROLE_INTERNAL, &dummy);
printDCB(dcb); printDCB(dcb);
ss_dfprintf(stderr, "\t..done\nAllocated dcb."); fprintf(stderr, "\t..done\nAllocated dcb.");
//TODO: Without running workers, the following will hang. As it does not //TODO: Without running workers, the following will hang. As it does not
//TODO: really add value (the only created dcb is the one above), we'll //TODO: really add value (the only created dcb is the one above), we'll
//TODO: exclude it. //TODO: exclude it.
//TODO: Some kind of test environment with workers would be needed. //TODO: Some kind of test environment with workers would be needed.
//printAllDCBs(); //printAllDCBs();
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
dcb->state = DCB_STATE_POLLING; dcb->state = DCB_STATE_POLLING;
this_thread.current_dcb = dcb; this_thread.current_dcb = dcb;
dcb_close(dcb); dcb_close(dcb);
ss_dfprintf(stderr, "Freed original dcb"); fprintf(stderr, "Freed original dcb");
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;
} }

30
server/core/test/test_hash.cc
View File

@ -108,19 +108,19 @@ static bool do_hashtest(
int longest; int longest;
int* iter; int* iter;
ss_dfprintf(stderr, fprintf(stderr,
"testhash : creating hash table of size %d, including %d " "testhash : creating hash table of size %d, including %d "
"elements in total, at time %g.", "elements in total, at time %g.",
argsize, argsize,
argelems, argelems,
(double)clock() - start); (double)clock() - start);
val_arr = (int *)MXS_MALLOC(sizeof(void *)*argelems); val_arr = (int *)MXS_MALLOC(sizeof(void *)*argelems);
MXS_ABORT_IF_NULL(val_arr); MXS_ABORT_IF_NULL(val_arr);
h = hashtable_alloc(argsize, hfun, cmpfun); h = hashtable_alloc(argsize, hfun, cmpfun);
ss_dfprintf(stderr, "\t..done\nAdd %d elements to hash table.", argelems); fprintf(stderr, "\t..done\nAdd %d elements to hash table.", argelems);
for (i = 0; i < argelems; i++) for (i = 0; i < argelems; i++)
{ {
@ -129,14 +129,14 @@ static bool do_hashtest(
} }
if (argelems > 1000) if (argelems > 1000)
{ {
ss_dfprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start); fprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start);
} }
ss_dfprintf(stderr, "\t..done\nRead hash table statistics."); fprintf(stderr, "\t..done\nRead hash table statistics.");
hashtable_get_stats((void *)h, &hsize, &nelems, &longest); hashtable_get_stats((void *)h, &hsize, &nelems, &longest);
ss_dfprintf(stderr, "\t..done\nValidate read values."); fprintf(stderr, "\t..done\nValidate read values.");
ss_info_dassert(hsize == (argsize > 0 ? argsize : 1), "Invalid hash size"); ss_info_dassert(hsize == (argsize > 0 ? argsize : 1), "Invalid hash size");
ss_info_dassert((nelems == argelems) || (nelems == 0 && argsize == 0), ss_info_dassert((nelems == argelems) || (nelems == 0 && argsize == 0),
@ -144,10 +144,10 @@ static bool do_hashtest(
ss_info_dassert(longest <= nelems, "Too large longest list value"); ss_info_dassert(longest <= nelems, "Too large longest list value");
if (argelems > 1000) if (argelems > 1000)
{ {
ss_dfprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start); fprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start);
} }
ss_dfprintf(stderr, "\t..done\nValidate iterator."); fprintf(stderr, "\t..done\nValidate iterator.");
HASHITERATOR *iterator = hashtable_iterator(h); HASHITERATOR *iterator = hashtable_iterator(h);
read_lock(h); read_lock(h);
@ -160,7 +160,7 @@ static bool do_hashtest(
} }
if (argelems < 100) if (argelems < 100)
{ {
ss_dfprintf(stderr, "\nNext item, iter = %d, i = %d", *iter, i); fprintf(stderr, "\nNext item, iter = %d, i = %d", *iter, i);
} }
} }
read_unlock(h); read_unlock(h);
@ -168,10 +168,10 @@ static bool do_hashtest(
hashtable_iterator_free(iterator); hashtable_iterator_free(iterator);
if (argelems > 1000) if (argelems > 1000)
{ {
ss_dfprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start); fprintf(stderr, "\t..done\nOperation took %g", (double)clock() - start);
} }
ss_dfprintf(stderr, "\t\t..done\n\nTest completed successfully.\n\n"); fprintf(stderr, "\t\t..done\n\nTest completed successfully.\n\n");
hashtable_free(h); hashtable_free(h);

8
server/core/test/test_hint.cc
View File

@ -46,20 +46,20 @@ test1()
HINT *hint; HINT *hint;
/* Hint tests */ /* Hint tests */
ss_dfprintf(stderr, fprintf(stderr,
"testhint : Add a parameter hint to a null list"); "testhint : Add a parameter hint to a null list");
char* name = MXS_STRDUP_A("name"); char* name = MXS_STRDUP_A("name");
hint = hint_create_parameter(NULL, name, "value"); hint = hint_create_parameter(NULL, name, "value");
MXS_FREE(name); MXS_FREE(name);
ss_info_dassert(NULL != hint, "New hint list should not be null"); ss_info_dassert(NULL != hint, "New hint list should not be null");
ss_info_dassert(0 == strcmp("value", (char*)hint->value), "Hint value should be correct"); ss_info_dassert(0 == strcmp("value", (char*)hint->value), "Hint value should be correct");
ss_info_dassert(0 != hint_exists(&hint, HINT_PARAMETER), "Hint of parameter type should exist"); ss_info_dassert(0 != hint_exists(&hint, HINT_PARAMETER), "Hint of parameter type should exist");
ss_dfprintf(stderr, "\t..done\nFree hints."); fprintf(stderr, "\t..done\nFree hints.");
if (NULL != hint) if (NULL != hint)
{ {
hint_free(hint); hint_free(hint);
} }
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;

16
server/core/test/test_modutil.cc
View File

@ -50,23 +50,23 @@ test1()
int result, length, residual; int result, length, residual;
/* Poll tests */ /* Poll tests */
ss_dfprintf(stderr, fprintf(stderr,
"testmodutil : Rudimentary tests."); "testmodutil : Rudimentary tests.");
buffer = gwbuf_alloc(100); buffer = gwbuf_alloc(100);
ss_info_dassert(GWBUF_IS_CONTIGUOUS(buffer), "Allocated buffer should be continuos"); ss_info_dassert(GWBUF_IS_CONTIGUOUS(buffer), "Allocated buffer should be continuos");
memset(GWBUF_DATA(buffer), 0, GWBUF_LENGTH(buffer)); memset(GWBUF_DATA(buffer), 0, GWBUF_LENGTH(buffer));
ss_info_dassert(0 == modutil_is_SQL(buffer), "Default buffer should be diagnosed as not SQL"); ss_info_dassert(0 == modutil_is_SQL(buffer), "Default buffer should be diagnosed as not SQL");
/* There would ideally be some straightforward way to create a SQL buffer? */ /* There would ideally be some straightforward way to create a SQL buffer? */
ss_dfprintf(stderr, "\t..done\nExtract SQL from buffer"); fprintf(stderr, "\t..done\nExtract SQL from buffer");
ss_info_dassert(0 == modutil_extract_SQL(buffer, &sql, &length), "Default buffer should fail"); ss_info_dassert(0 == modutil_extract_SQL(buffer, &sql, &length), "Default buffer should fail");
ss_dfprintf(stderr, "\t..done\nExtract SQL from buffer different way?"); fprintf(stderr, "\t..done\nExtract SQL from buffer different way?");
ss_info_dassert(0 == modutil_MySQL_Query(buffer, &sql, &length, &residual), "Default buffer should fail"); ss_info_dassert(0 == modutil_MySQL_Query(buffer, &sql, &length, &residual), "Default buffer should fail");
ss_dfprintf(stderr, "\t..done\nReplace SQL in buffer"); fprintf(stderr, "\t..done\nReplace SQL in buffer");
ss_info_dassert(0 == modutil_replace_SQL(buffer, (char*)"select * from some_table;"), ss_info_dassert(0 == modutil_replace_SQL(buffer, (char*)"select * from some_table;"),
"Default buffer should fail"); "Default buffer should fail");
ss_dfprintf(stderr, "\t..done\nTidy up."); fprintf(stderr, "\t..done\nTidy up.");
gwbuf_free(buffer); gwbuf_free(buffer);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;
@ -95,7 +95,7 @@ test2()
ss_dassert(strcmp(result, query) == 0); ss_dassert(strcmp(result, query) == 0);
gwbuf_free(buffer); gwbuf_free(buffer);
MXS_FREE(result); MXS_FREE(result);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;
} }

24
server/core/test/test_poll.cc
View File

@ -56,15 +56,15 @@ test1()
service.routerModule = (char*)"required by a check in dcb.cc"; service.routerModule = (char*)"required by a check in dcb.cc";
/* Poll tests */ /* Poll tests */
ss_dfprintf(stderr, fprintf(stderr,
"testpoll : Initialise the polling system."); "testpoll : Initialise the polling system.");
init_test_env(NULL); init_test_env(NULL);
ss_dfprintf(stderr, "\t..done\nAdd a DCB"); fprintf(stderr, "\t..done\nAdd a DCB");
dcb = dcb_alloc(DCB_ROLE_CLIENT_HANDLER, &dummy); dcb = dcb_alloc(DCB_ROLE_CLIENT_HANDLER, &dummy);
if (dcb == NULL) if (dcb == NULL)
{ {
ss_dfprintf(stderr, "\nError on function call: dcb_alloc() returned NULL.\n"); fprintf(stderr, "\nError on function call: dcb_alloc() returned NULL.\n");
return 1; return 1;
} }
@ -74,38 +74,38 @@ test1()
if (dcb->fd < 0) if (dcb->fd < 0)
{ {
char errbuf[MXS_STRERROR_BUFLEN]; char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr, "\nError on function call: socket() returned %d: %s\n", fprintf(stderr, "\nError on function call: socket() returned %d: %s\n",
errno, strerror_r(errno, errbuf, sizeof(errbuf))); errno, strerror_r(errno, errbuf, sizeof(errbuf)));
return 1; return 1;
} }
if ((eno = poll_add_dcb(dcb)) != 0) if ((eno = poll_add_dcb(dcb)) != 0)
{ {
ss_dfprintf(stderr, "\nError on function call: poll_add_dcb() returned %d.\n", eno); fprintf(stderr, "\nError on function call: poll_add_dcb() returned %d.\n", eno);
return 1; return 1;
} }
if ((eno = poll_remove_dcb(dcb)) != 0) if ((eno = poll_remove_dcb(dcb)) != 0)
{ {
ss_dfprintf(stderr, "\nError on function call: poll_remove_dcb() returned %d.\n", eno); fprintf(stderr, "\nError on function call: poll_remove_dcb() returned %d.\n", eno);
return 1; return 1;
} }
if ((eno = poll_add_dcb(dcb)) != 0) if ((eno = poll_add_dcb(dcb)) != 0)
{ {
ss_dfprintf(stderr, "\nError on function call: poll_add_dcb() returned %d.\n", eno); fprintf(stderr, "\nError on function call: poll_add_dcb() returned %d.\n", eno);
return 1; return 1;
} }
ss_dfprintf(stderr, "\t..done\nStart wait for events."); fprintf(stderr, "\t..done\nStart wait for events.");
sleep(10); sleep(10);
//TODO, fix this for workers: poll_shutdown(); //TODO, fix this for workers: poll_shutdown();
ss_dfprintf(stderr, "\t..done\nTidy up."); fprintf(stderr, "\t..done\nTidy up.");
SERVICE my_service = {}; SERVICE my_service = {};
dcb->service = &my_service; dcb->service = &my_service;
dcb_close(dcb); dcb_close(dcb);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;

14
server/core/test/test_server.cc
View File

@ -64,21 +64,21 @@ test1()
char *status; char *status;
/* Server tests */ /* Server tests */
ss_dfprintf(stderr, "testserver : creating server called MyServer"); fprintf(stderr, "testserver : creating server called MyServer");
server = server_alloc("uniquename", params.params()); server = server_alloc("uniquename", params.params());
ss_info_dassert(server, "Allocating the server should not fail"); ss_info_dassert(server, "Allocating the server should not fail");
char buf[120]; char buf[120];
ss_dfprintf(stderr, "\t..done\nTest Parameter for Server."); fprintf(stderr, "\t..done\nTest Parameter for Server.");
ss_info_dassert(!server_get_parameter(server, "name", buf, sizeof(buf)), "Parameter should be null when not set"); ss_info_dassert(!server_get_parameter(server, "name", buf, sizeof(buf)), "Parameter should be null when not set");
server_add_parameter(server, "name", "value"); server_add_parameter(server, "name", "value");
ss_dassert(server_get_parameter(server, "name", buf, sizeof(buf))); ss_dassert(server_get_parameter(server, "name", buf, sizeof(buf)));
ss_info_dassert(strcmp("value", buf) == 0, "Parameter should be returned correctly"); ss_info_dassert(strcmp("value", buf) == 0, "Parameter should be returned correctly");
ss_dfprintf(stderr, "\t..done\nTesting Unique Name for Server."); fprintf(stderr, "\t..done\nTesting Unique Name for Server.");
ss_info_dassert(NULL == server_find_by_unique_name("non-existent"), ss_info_dassert(NULL == server_find_by_unique_name("non-existent"),
"Should not find non-existent unique name."); "Should not find non-existent unique name.");
ss_info_dassert(server == server_find_by_unique_name("uniquename"), "Should find by unique name."); ss_info_dassert(server == server_find_by_unique_name("uniquename"), "Should find by unique name.");
ss_dfprintf(stderr, "\t..done\nTesting Status Setting for Server."); fprintf(stderr, "\t..done\nTesting Status Setting for Server.");
status = server_status(server); status = server_status(server);
ss_info_dassert(0 == strcmp("Running", status), "Status of Server should be Running by default."); ss_info_dassert(0 == strcmp("Running", status), "Status of Server should be Running by default.");
if (NULL != status) if (NULL != status)
@ -97,12 +97,12 @@ test1()
{ {
MXS_FREE(status); MXS_FREE(status);
} }
ss_dfprintf(stderr, "\t..done\nRun Prints for Server and all Servers."); fprintf(stderr, "\t..done\nRun Prints for Server and all Servers.");
printServer(server); printServer(server);
printAllServers(); printAllServers();
ss_dfprintf(stderr, "\t..done\nFreeing Server."); fprintf(stderr, "\t..done\nFreeing Server.");
server_free((Server*)server); server_free((Server*)server);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;
} }

8
server/core/test/test_service.cc
View File

@ -63,18 +63,18 @@ test1()
load_module("readconnroute", MODULE_ROUTER); load_module("readconnroute", MODULE_ROUTER);
/* Service tests */ /* Service tests */
ss_dfprintf(stderr, fprintf(stderr,
"testservice : creating service called MyService with router nonexistent"); "testservice : creating service called MyService with router nonexistent");
service = service_alloc("MyService", "non-existent", NULL); service = service_alloc("MyService", "non-existent", NULL);
ss_info_dassert(NULL == service, "New service with invalid router should be null"); ss_info_dassert(NULL == service, "New service with invalid router should be null");
ss_info_dassert(0 == service_isvalid(service), "Service must not be valid after incorrect creation"); ss_info_dassert(0 == service_isvalid(service), "Service must not be valid after incorrect creation");
ss_dfprintf(stderr, "\t..done\nValid service creation, router testroute."); fprintf(stderr, "\t..done\nValid service creation, router testroute.");
service = service_alloc("MyService", "readconnroute", NULL); service = service_alloc("MyService", "readconnroute", NULL);
ss_info_dassert(NULL != service, "New service with valid router must not be null"); ss_info_dassert(NULL != service, "New service with valid router must not be null");
ss_info_dassert(0 != service_isvalid(service), "Service must be valid after creation"); ss_info_dassert(0 != service_isvalid(service), "Service must be valid after creation");
ss_info_dassert(0 == strcmp("MyService", service->name), "Service must have given name"); ss_info_dassert(0 == strcmp("MyService", service->name), "Service must have given name");
ss_dfprintf(stderr, "\t..done\nAdding protocol testprotocol."); fprintf(stderr, "\t..done\nAdding protocol testprotocol.");
ss_info_dassert(serviceCreateListener(service, "TestProtocol", "mariadbclient", ss_info_dassert(serviceCreateListener(service, "TestProtocol", "mariadbclient",
"localhost", 9876, "MySQLAuth", NULL, NULL), "localhost", 9876, "MySQLAuth", NULL, NULL),
"Add Protocol should succeed"); "Add Protocol should succeed");

12
server/core/test/test_session.cc
View File

@ -48,21 +48,21 @@ test1()
int result; int result;
/* Poll tests */ /* Poll tests */
ss_dfprintf(stderr, fprintf(stderr,
"testpoll : Initialise the polling system."); "testpoll : Initialise the polling system.");
poll_init(); poll_init();
ss_dfprintf(stderr, "\t..done\nAdd a DCB"); fprintf(stderr, "\t..done\nAdd a DCB");
dcb = dcb_alloc(DCB_ROLE_SERVICE_LISTENER); dcb = dcb_alloc(DCB_ROLE_SERVICE_LISTENER);
dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0); dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0);
poll_add_dcb(dcb); poll_add_dcb(dcb);
poll_remove_dcb(dcb); poll_remove_dcb(dcb);
poll_add_dcb(dcb); poll_add_dcb(dcb);
ss_dfprintf(stderr, "\t..done\nStart wait for events."); fprintf(stderr, "\t..done\nStart wait for events.");
sleep(10); sleep(10);
poll_shutdown(); poll_shutdown();
ss_dfprintf(stderr, "\t..done\nTidy up."); fprintf(stderr, "\t..done\nTidy up.");
dcb_close(dcb); dcb_close(dcb);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;

8
server/core/test/test_session_track.cc
View File

@ -170,7 +170,7 @@ void test1()
GWBUF *buffer; GWBUF *buffer;
proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK; proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK;
proto.num_eof_packets = 0; proto.num_eof_packets = 0;
ss_dfprintf(stderr, "test_session_track : Functional tests.\n"); fprintf(stderr, "test_session_track : Functional tests.\n");
//BEGIN //BEGIN
buffer = gwbuf_alloc_and_load(PACKET_1_LEN, resultset1 + PACKET_1_IDX); buffer = gwbuf_alloc_and_load(PACKET_1_LEN, resultset1 + PACKET_1_IDX);
mxs_mysql_get_session_track_info(buffer, &proto); mxs_mysql_get_session_track_info(buffer, &proto);
@ -219,7 +219,7 @@ void test1()
void test2() void test2()
{ {
GWBUF *buffer; GWBUF *buffer;
ss_dfprintf(stderr, "test_session_track: multi results test\n"); fprintf(stderr, "test_session_track: multi results test\n");
proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK; proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK;
proto.num_eof_packets = 0; proto.num_eof_packets = 0;
buffer = gwbuf_alloc_and_load(sizeof(resultset2), resultset2); buffer = gwbuf_alloc_and_load(sizeof(resultset2), resultset2);
@ -233,7 +233,7 @@ void test3()
GWBUF *buffer; GWBUF *buffer;
proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK; proto.server_capabilities = GW_MYSQL_CAPABILITIES_SESSION_TRACK;
proto.num_eof_packets = 0; proto.num_eof_packets = 0;
ss_dfprintf(stderr, "test_session_track: protocol state test\n"); fprintf(stderr, "test_session_track: protocol state test\n");
buffer = gwbuf_alloc_and_load(sizeof(resultset2), resultset2); buffer = gwbuf_alloc_and_load(sizeof(resultset2), resultset2);
mxs_mysql_get_session_track_info(buffer, &proto); mxs_mysql_get_session_track_info(buffer, &proto);
ss_dassert(strncmp(gwbuf_get_property(buffer, (char *)"trx_state"), "I_R_W___", 8) == 0); ss_dassert(strncmp(gwbuf_get_property(buffer, (char *)"trx_state"), "I_R_W___", 8) == 0);
@ -246,4 +246,4 @@ int main(int argc, char **argv)
test2(); test2();
test3(); test3();
return 0; return 0;
} }

16
server/core/test/test_users.cc
View File

@ -42,11 +42,11 @@ static int test1()
bool rv; bool rv;
/* Poll tests */ /* Poll tests */
ss_dfprintf(stderr, fprintf(stderr,
"testusers : Initialise the user table."); "testusers : Initialise the user table.");
users = users_alloc(); users = users_alloc();
ss_info_dassert(NULL != users, "Allocating user table should not return NULL."); ss_info_dassert(NULL != users, "Allocating user table should not return NULL.");
ss_dfprintf(stderr, "\t..done\nAdd a user"); fprintf(stderr, "\t..done\nAdd a user");
rv = users_add(users, "username", "authorisation", USER_ACCOUNT_ADMIN); rv = users_add(users, "username", "authorisation", USER_ACCOUNT_ADMIN);
ss_info_dassert(rv, "Should add one user"); ss_info_dassert(rv, "Should add one user");
rv = users_auth(users, "username", "authorisation"); rv = users_auth(users, "username", "authorisation");
@ -54,14 +54,14 @@ static int test1()
rv = users_auth(users, "username", "newauth"); rv = users_auth(users, "username", "newauth");
ss_info_dassert(rv == 0, "Fetch invalid user must return NULL"); ss_info_dassert(rv == 0, "Fetch invalid user must return NULL");
ss_dfprintf(stderr, "\t..done\nAdd another user"); fprintf(stderr, "\t..done\nAdd another user");
rv = users_add(users, "username2", "authorisation2", USER_ACCOUNT_ADMIN); rv = users_add(users, "username2", "authorisation2", USER_ACCOUNT_ADMIN);
ss_info_dassert(rv, "Should add one user"); ss_info_dassert(rv, "Should add one user");
ss_dfprintf(stderr, "\t..done\nDelete a user."); fprintf(stderr, "\t..done\nDelete a user.");
rv = users_delete(users, "username"); rv = users_delete(users, "username");
ss_info_dassert(rv, "Should delete just one user"); ss_info_dassert(rv, "Should delete just one user");
ss_dfprintf(stderr, "\t..done\nDump users table."); fprintf(stderr, "\t..done\nDump users table.");
json_t* dump = users_to_json(users); json_t* dump = users_to_json(users);
ss_info_dassert(dump, "Users should be dumped"); ss_info_dassert(dump, "Users should be dumped");
USERS* loaded_users = users_from_json(dump); USERS* loaded_users = users_from_json(dump);
@ -71,9 +71,9 @@ static int test1()
users_free(loaded_users); users_free(loaded_users);
ss_info_dassert(rv, "Loaded users should contain users"); ss_info_dassert(rv, "Loaded users should contain users");
ss_dfprintf(stderr, "\t..done\nFree user table."); fprintf(stderr, "\t..done\nFree user table.");
users_free(users); users_free(users);
ss_dfprintf(stderr, "\t..done\n"); fprintf(stderr, "\t..done\n");
return 0; return 0;