Changed log manager API. Removed unnecessary memory context pointer (always NULL):
bool skygw_logmanager_init(void** buf, int argc, char* argv[]) >> bool skygw_logmanager_init(int argc, char* argv[]) void skygw_logmanager_done(void** buf) >> void skygw_logmanager_done(void) void skygw_log_done(void* writebuf) >> void skygw_log_done(void) int skygw_log_write(void* writebuf, logfile_id_t id, char* format, ...) >> int skygw_log_write(logfile_id_t id, char* format, ...) int skygw_log_write_flush(void* writebuf, logfile_id_t id, char* format, ...) >> int skygw_log_write_flush(logfile_id_t id, char* format, ...) --- static functions : static bool logmanager_init_nomutex(void** p_ctx, int argc, char* argv[]) >> static bool logmanager_init_nomutex(int argc, char* argv[]) static void logmanager_done_nomutex(void** ctx) >> static void logmanager_done_nomutex(void)
This commit is contained in:
@ -167,8 +167,8 @@ static void* thr_filewriter_fun(void* data);
|
|||||||
static logfile_t* logmanager_get_logfile(logmanager_t* lm, logfile_id_t id);
|
static logfile_t* logmanager_get_logfile(logmanager_t* lm, logfile_id_t id);
|
||||||
static bool logmanager_register(bool writep);
|
static bool logmanager_register(bool writep);
|
||||||
static void logmanager_unregister(void);
|
static void logmanager_unregister(void);
|
||||||
static bool logmanager_init_nomutex(void** p_ctx, int argc, char* argv[]);
|
static bool logmanager_init_nomutex(int argc, char* argv[]);
|
||||||
static void logmanager_done_nomutex(void** ctx);
|
static void logmanager_done_nomutex(void);
|
||||||
static int logmanager_write_log(
|
static int logmanager_write_log(
|
||||||
logfile_id_t id,
|
logfile_id_t id,
|
||||||
bool flush,
|
bool flush,
|
||||||
@ -232,7 +232,6 @@ const char* get_logpath_default(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool logmanager_init_nomutex(
|
static bool logmanager_init_nomutex(
|
||||||
void** p_ctx,
|
|
||||||
int argc,
|
int argc,
|
||||||
char* argv[])
|
char* argv[])
|
||||||
{
|
{
|
||||||
@ -283,7 +282,7 @@ static bool logmanager_init_nomutex(
|
|||||||
return_succp:
|
return_succp:
|
||||||
if (err != 0) {
|
if (err != 0) {
|
||||||
/** This releases memory of all created objects */
|
/** This releases memory of all created objects */
|
||||||
logmanager_done_nomutex(NULL);
|
logmanager_done_nomutex();
|
||||||
fprintf(stderr, "Initializing logmanager failed.\n");
|
fprintf(stderr, "Initializing logmanager failed.\n");
|
||||||
}
|
}
|
||||||
return succp;
|
return succp;
|
||||||
@ -312,7 +311,6 @@ return_succp:
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
bool skygw_logmanager_init(
|
bool skygw_logmanager_init(
|
||||||
void** p_ctx,
|
|
||||||
int argc,
|
int argc,
|
||||||
char* argv[])
|
char* argv[])
|
||||||
{
|
{
|
||||||
@ -327,7 +325,7 @@ bool skygw_logmanager_init(
|
|||||||
goto return_succp;
|
goto return_succp;
|
||||||
}
|
}
|
||||||
|
|
||||||
succp = logmanager_init_nomutex(p_ctx, argc, argv);
|
succp = logmanager_init_nomutex(argc, argv);
|
||||||
|
|
||||||
return_succp:
|
return_succp:
|
||||||
release_lock(&lmlock);
|
release_lock(&lmlock);
|
||||||
@ -337,8 +335,7 @@ return_succp:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void logmanager_done_nomutex(
|
static void logmanager_done_nomutex(void)
|
||||||
void** ctx)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
logfile_t* lf;
|
logfile_t* lf;
|
||||||
@ -391,7 +388,7 @@ static void logmanager_done_nomutex(
|
|||||||
*/
|
*/
|
||||||
void skygw_logmanager_exit(void)
|
void skygw_logmanager_exit(void)
|
||||||
{
|
{
|
||||||
skygw_logmanager_done(NULL);
|
skygw_logmanager_done();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -411,8 +408,7 @@ void skygw_logmanager_exit(void)
|
|||||||
* @details Stops file writing thread, releases filewriter, and logfiles.
|
* @details Stops file writing thread, releases filewriter, and logfiles.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void skygw_logmanager_done(
|
void skygw_logmanager_done(void)
|
||||||
void** p_ctx)
|
|
||||||
{
|
{
|
||||||
ss_dfprintf(stderr, ">> skygw_logmanager_done\n");
|
ss_dfprintf(stderr, ">> skygw_logmanager_done\n");
|
||||||
|
|
||||||
@ -440,7 +436,7 @@ void skygw_logmanager_done(
|
|||||||
goto return_void;
|
goto return_void;
|
||||||
}
|
}
|
||||||
ss_dassert(lm->lm_nlinks == 0);
|
ss_dassert(lm->lm_nlinks == 0);
|
||||||
logmanager_done_nomutex(p_ctx);
|
logmanager_done_nomutex();
|
||||||
|
|
||||||
return_void:
|
return_void:
|
||||||
release_lock(&lmlock);
|
release_lock(&lmlock);
|
||||||
@ -846,7 +842,6 @@ static blockbuf_t* blockbuf_init(
|
|||||||
|
|
||||||
|
|
||||||
int skygw_log_write_flush(
|
int skygw_log_write_flush(
|
||||||
void* ctx,
|
|
||||||
logfile_id_t id,
|
logfile_id_t id,
|
||||||
char* str,
|
char* str,
|
||||||
...)
|
...)
|
||||||
@ -898,7 +893,6 @@ return_err:
|
|||||||
|
|
||||||
|
|
||||||
int skygw_log_write(
|
int skygw_log_write(
|
||||||
void* ctx,
|
|
||||||
logfile_id_t id,
|
logfile_id_t id,
|
||||||
char* str,
|
char* str,
|
||||||
...)
|
...)
|
||||||
@ -1021,7 +1015,7 @@ static bool logmanager_register(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (lm == NULL) {
|
if (lm == NULL) {
|
||||||
succp = logmanager_init_nomutex(NULL, 0, NULL);
|
succp = logmanager_init_nomutex(0, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/** if logmanager existed or was succesfully restarted, increase link */
|
/** if logmanager existed or was succesfully restarted, increase link */
|
||||||
|
@ -45,22 +45,22 @@ typedef enum { UNINIT = 0, INIT, RUN, DONE } flat_obj_state_t;
|
|||||||
|
|
||||||
EXTERN_C_BLOCK_BEGIN
|
EXTERN_C_BLOCK_BEGIN
|
||||||
|
|
||||||
bool skygw_logmanager_init(void** buf, int argc, char* argv[]);
|
bool skygw_logmanager_init(int argc, char* argv[]);
|
||||||
void skygw_logmanager_done(void** buf);
|
void skygw_logmanager_done(void);
|
||||||
void skygw_logmanager_exit(void);
|
void skygw_logmanager_exit(void);
|
||||||
/** not implemented yet */
|
/** not implemented yet */
|
||||||
/**
|
/**
|
||||||
* init write buffer list for private use for this client. Same as
|
* init write buffer list for private use for this client. Same as
|
||||||
* skygw_logmanager_init except that arguments are not set.
|
* skygw_logmanager_init except that arguments are not set.
|
||||||
*/
|
*/
|
||||||
bool skygw_log_init(void** writebuf);
|
bool skygw_log_init(void);
|
||||||
/**
|
/**
|
||||||
* free private write buffer list
|
* free private write buffer list
|
||||||
*/
|
*/
|
||||||
void skygw_log_done(void* writebuf);
|
void skygw_log_done(void);
|
||||||
int skygw_log_write(void* writebuf, logfile_id_t id, char* format, ...);
|
int skygw_log_write(logfile_id_t id, char* format, ...);
|
||||||
int skygw_log_flush(logfile_id_t id);
|
int skygw_log_flush(logfile_id_t id);
|
||||||
int skygw_log_write_flush(void* writebuf, logfile_id_t id, char* format, ...);
|
int skygw_log_write_flush(logfile_id_t id, char* format, ...);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -75,29 +75,3 @@ const char* get_msg_suffix_default(void);
|
|||||||
const char* get_err_prefix_default(void);
|
const char* get_err_prefix_default(void);
|
||||||
const char* get_err_suffix_default(void);
|
const char* get_err_suffix_default(void);
|
||||||
const char* get_logpath_default(void);
|
const char* get_logpath_default(void);
|
||||||
|
|
||||||
/*
|
|
||||||
bool logfile_write(
|
|
||||||
skygw_ctx_t* ctx,
|
|
||||||
logmgr_t* mgr,
|
|
||||||
logfile_id_t id,
|
|
||||||
char* msg);
|
|
||||||
|
|
||||||
bool logfile_write_flush(
|
|
||||||
skygw_ctx_t* ctx,
|
|
||||||
logmgr_t* mgr,
|
|
||||||
logfile_id_t id,
|
|
||||||
char* msg);
|
|
||||||
|
|
||||||
bool logfile_flush(
|
|
||||||
logmgr_t* mgr,
|
|
||||||
logfile_id_t id);
|
|
||||||
|
|
||||||
bool logfile_init(
|
|
||||||
logmgr_t* mgr,
|
|
||||||
logfile_id_t id);
|
|
||||||
|
|
||||||
void logfile_done(
|
|
||||||
logmgr_t* mgr,
|
|
||||||
logfile_id_t id);
|
|
||||||
*/
|
|
||||||
|
Reference in New Issue
Block a user