From 1b764eba74de590e1cb654324c362f589e6c1cb2 Mon Sep 17 00:00:00 2001 From: vraatikka Date: Thu, 27 Jun 2013 23:33:20 +0300 Subject: [PATCH] Little fixes --- log_manager/log_manager.cc | 8 +++++++- utils/skygw_types.h | 2 ++ utils/skygw_utils.h | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc index ae3816fef..dc6792c7a 100644 --- a/log_manager/log_manager.cc +++ b/log_manager/log_manager.cc @@ -257,6 +257,8 @@ return_succp: return succp; } + + /** * @node Initializes log managing routines in SkySQL Gateway. * @@ -341,6 +343,7 @@ static void logmanager_done_nomutex( lm = NULL; } + /** * @node End execution of log manager * @@ -1263,7 +1266,9 @@ static void* thr_filewriter_fun( wb = (logfile_writebuf_t*)node->mlnode_data; writep = wb->wb_buf; nbytes = strlen(writep); - ss_debug(succp = )skygw_file_write(file, (void *)writep, nbytes); + ss_debug(succp = )skygw_file_write(file, + (void *)writep, + nbytes); ss_dassert(succp); prev_node = node; node = node->mlnode_next; @@ -1272,6 +1277,7 @@ static void* thr_filewriter_fun( } } /* for */ } /* while */ + ss_debug(skygw_thread_set_state(thr, THR_STOPPED)); /** Inform log manager that file writer thread has stopped. */ skygw_message_send(fwr->fwr_clientmes); diff --git a/utils/skygw_types.h b/utils/skygw_types.h index 6d0d3b26b..83e108384 100644 --- a/utils/skygw_types.h +++ b/utils/skygw_types.h @@ -41,6 +41,8 @@ # define FALSE false #elif !defined(TRUE) && !defined(FALSE) typedef enum {FALSE=0, TRUE} bool; +#else +#define bool int #endif #endif /* SKYGW_TYPES_H */ diff --git a/utils/skygw_utils.h b/utils/skygw_utils.h index c02c41c50..c9ee09e5e 100644 --- a/utils/skygw_utils.h +++ b/utils/skygw_utils.h @@ -107,6 +107,9 @@ skygw_thread_t* skygw_thread_init( void skygw_thread_done(skygw_thread_t* th); int skygw_thread_start(skygw_thread_t* thr); skygw_thr_state_t skygw_thread_get_state(skygw_thread_t* thr); + +EXTERN_C_BLOCK_BEGIN + void skygw_thread_set_state( skygw_thread_t* thr, skygw_thr_state_t state); @@ -116,6 +119,9 @@ bool skygw_thread_set_exitflag( skygw_thread_t* thr, skygw_message_t* sendmes, skygw_message_t* recmes); + +EXTERN_C_BLOCK_END + /** Skygw thread routines */ /** Skygw file routines */