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

Miniman changes to make testlog work.

Browse Source 
testlog.c can never have worked, or then it cannot have been
kept up to date for a very long time.
This commit is contained in:
Johan Wikman
2015-11-09 12:45:50 +02:00
parent abea233a2e
commit 14b8dbc4d8
2 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
log_manager/test/CMakeLists.txt
View File

@ -3,3 +3,4 @@ add_executable(testorder testorder.c)
target_link_libraries(testlog pthread log_manager utils) target_link_libraries(testlog pthread log_manager utils)
target_link_libraries(testorder pthread log_manager utils) target_link_libraries(testorder pthread log_manager utils)
add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log) add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log)
add_test(Internal-TestLog testlog)

83
log_manager/test/testlog.c
View File

@ -24,6 +24,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libgen.h>
#include <skygw_utils.h> #include <skygw_utils.h>
#include <log_manager.h> #include <log_manager.h>
@ -52,6 +53,15 @@ static void* thr_run_morelog(void* data);
#define TEST3 #define TEST3
#define TEST4 #define TEST4
const char USAGE[]=
"usage: %s [-t <#threads>]\n"
"\n"
"-t: Number of threads. Default is %d.\n";
const int N_THR = 4;
#define TEST_ERROR(msg)\
do { fprintf(stderr, "[%s:%d]: %s\n", basename(__FILE__), __LINE__, msg); } while (false)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
int err = 0; int err = 0;
@ -66,7 +76,7 @@ int main(int argc, char* argv[])
time_t t; time_t t;
struct tm tm; struct tm tm;
char c; char c;
int nthr = 0; int nthr = N_THR;
int log_argc = 0; int log_argc = 0;
char** log_argv = NULL; char** log_argv = NULL;
@ -75,21 +85,27 @@ int main(int argc, char* argv[])
switch (c) { switch (c) {
case 't': case 't':
nthr = atoi(optarg); nthr = atoi(optarg);
if (nthr <= 0)
{
err = 1;
}
break; break;
default: default:
err = 1;
break; break;
} }
} }
if (nthr <= 0) if (err != 0)
{ {
fprintf(stderr, "Thread count argument is zero or " fprintf(stderr, USAGE, argv[0], N_THR);
"negative. Exiting.\n");
err = 1; err = 1;
goto return_err; goto return_err;
} }
printf("Using %d threads.\n", nthr);
thr = (thread_t **)calloc(1, nthr*sizeof(thread_t*)); thr = (thread_t **)calloc(1, nthr*sizeof(thread_t*));
if (thr == NULL) if (thr == NULL)
@ -319,20 +335,20 @@ int main(int argc, char* argv[])
#if !defined(SS_DEBUG) #if !defined(SS_DEBUG)
skygw_log_enable(LOGFILE_TRACE); skygw_log_enable(LOGFILE_TRACE);
#endif #endif
succp = skygw_logmanager_init("/tmp", log_argc, log_argv);
ss_dassert(succp);
logstr = ("\tTEST 3 - test enabling and disabling logs."); logstr = ("\tTEST 3 - test enabling and disabling logs.");
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
succp = skygw_logmanager_init("/tmp", log_argc, log_argv);
ss_dassert(succp);
skygw_log_disable(LOGFILE_TRACE); skygw_log_disable(LOGFILE_TRACE);
logstr = ("1.\tWrite once to ERROR and twice to MESSAGE log."); logstr = ("1.\tWrite once to ERROR and twice to MESSAGE log.");
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
@ -355,18 +371,18 @@ int main(int argc, char* argv[])
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
skygw_log_disable(LOGFILE_MESSAGE); skygw_log_disable(LOGFILE_MESSAGE);
skygw_log_disable(LOGFILE_TRACE); skygw_log_disable(LOGFILE_TRACE);
logstr = ("4.\tWrite to none."); logstr = ("4.\tWrite to none.");
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
skygw_log_enable(LOGFILE_ERROR); skygw_log_enable(LOGFILE_ERROR);
skygw_log_enable(LOGFILE_MESSAGE); skygw_log_enable(LOGFILE_MESSAGE);
@ -375,7 +391,7 @@ int main(int argc, char* argv[])
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
ss_dassert(err != 0); /**< Must fail */ ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
@ -401,6 +417,7 @@ int main(int argc, char* argv[])
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_log_enable(LOGFILE_TRACE);
logstr = ("3.\tWrite to TRACE log only."); logstr = ("3.\tWrite to TRACE log only.");
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
@ -415,7 +432,7 @@ int main(int argc, char* argv[])
logstr = ("5.\tThis should not appear anywhere since MESSAGE " logstr = ("5.\tThis should not appear anywhere since MESSAGE "
"is disabled."); "is disabled.");
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
ss_dassert(err != 0); ss_dassert(err == 0);
skygw_logmanager_done(); skygw_logmanager_done();
@ -447,7 +464,7 @@ int main(int argc, char* argv[])
logstr = ("10.\tThis should not appear anywhere since MESSAGE is " logstr = ("10.\tThis should not appear anywhere since MESSAGE is "
"disabled."); "disabled.");
err = skygw_log_write_flush(LOGFILE_MESSAGE, logstr); err = skygw_log_write_flush(LOGFILE_MESSAGE, logstr);
ss_dassert(err != 0); ss_dassert(err == 0);
skygw_log_enable(LOGFILE_MESSAGE); skygw_log_enable(LOGFILE_MESSAGE);
@ -493,14 +510,13 @@ static void* thr_run(void* data)
int err; int err;
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
skygw_logmanager_done();
skygw_log_flush(LOGFILE_MESSAGE); skygw_log_flush(LOGFILE_MESSAGE);
logstr = ("Hi, how are you?"); logstr = ("Hi, how are you?");
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_done(); skygw_logmanager_done();
@ -513,7 +529,7 @@ static void* thr_run(void* data)
"cat, you know."); "cat, you know.");
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
@ -522,7 +538,7 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
@ -530,11 +546,13 @@ static void* thr_run(void* data)
skygw_log_flush(LOGFILE_ERROR); skygw_log_flush(LOGFILE_ERROR);
logstr = ("For automatic and register variables, it is done each time the function or block is entered."); logstr = ("For automatic and register variables, it is done each time the function or block is entered.");
#if !defined(SS_DEBUG)
skygw_log_enable(LOGFILE_TRACE); skygw_log_enable(LOGFILE_TRACE);
#endif
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_done(); skygw_logmanager_done();
@ -547,22 +565,22 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
skygw_logmanager_done(); skygw_logmanager_done();
skygw_log_flush(LOGFILE_ERROR); skygw_log_flush(LOGFILE_ERROR);
skygw_logmanager_done(); skygw_logmanager_done();
skygw_logmanager_done(); skygw_logmanager_init("/tmp", 0, NULL);
logstr = ("..and you?"); logstr = ("..and you?");
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_done();
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
logstr = ("For automatic and register variables, it is done each time the function or block is entered."); logstr = ("For automatic and register variables, it is done each time the function or block is entered.");
#if !defined(SS_DEBUG) #if !defined(SS_DEBUG)
@ -571,7 +589,7 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
@ -583,7 +601,7 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
@ -591,10 +609,11 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_MESSAGE, logstr); err = skygw_log_write(LOGFILE_MESSAGE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_done(); skygw_logmanager_done();
skygw_logmanager_init("/tmp", 0, NULL);
#if !defined(SS_DEBUG) #if !defined(SS_DEBUG)
skygw_log_enable(LOGFILE_TRACE); skygw_log_enable(LOGFILE_TRACE);
#endif #endif
@ -606,26 +625,28 @@ static void* thr_run(void* data)
err = skygw_log_write(LOGFILE_TRACE, logstr); err = skygw_log_write(LOGFILE_TRACE, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_done(); skygw_logmanager_done();
skygw_logmanager_init("/tmp", 0, NULL);
logstr = ("Testing. One, two, three, four\n"); logstr = ("Testing. One, two, three, four\n");
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_done();
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
logstr = ("Testing. One, two, three, .. where was I?\n"); logstr = ("Testing. One, two, three, .. where was I?\n");
err = skygw_log_write(LOGFILE_ERROR, logstr); err = skygw_log_write(LOGFILE_ERROR, logstr);
if (err != 0) if (err != 0)
{ {
fprintf(stderr,"Error, log write failed.\n"); TEST_ERROR("Error, log write failed.");
} }
ss_dassert(err == 0); ss_dassert(err == 0);
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_done();
skygw_logmanager_init("/tmp", 0, NULL); skygw_logmanager_init("/tmp", 0, NULL);
skygw_logmanager_done(); skygw_logmanager_done();
simple_mutex_lock(td->mtx, true); simple_mutex_lock(td->mtx, true);