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

Some re-arranging of functionality.

Browse Source 
Some thread specific functionality moved from thr_flush_file
to the caller thr_filewriter_fun.
This commit is contained in:
Johan Wikman
2015-11-03 21:42:21 +02:00
parent 4de363e8dd
commit 8798475a46
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
log_manager/log_manager.cc
View File

@ -2836,7 +2836,7 @@ static void filewriter_done(filewriter_t* fw)
} }
} }
static bool thr_flush_file(skygw_thread_t* thr, logmanager_t *lm, filewriter_t *fwr, logfile_id_t id) static bool thr_flush_file(logmanager_t *lm, filewriter_t *fwr, logfile_id_t id)
{ {
/** /**
* Get file pointer of current logfile. * Get file pointer of current logfile.
@ -2986,22 +2986,16 @@ static bool thr_flush_file(skygw_thread_t* thr, logmanager_t *lm, filewriter_t *
* flushed. * flushed.
*/ */
bool all_done = true; bool done = true;
if (flushall_started_flag) if (flushall_started_flag)
{ {
flushall_started_flag = false; flushall_started_flag = false;
flushall_done_flag = true; flushall_done_flag = true;
all_done = false; done = false;
} }
if (!thr_flushall_check() && skygw_thread_must_exit(thr)) return done;
{
flushall_logfiles(true);
all_done = false;
}
return all_done;
} }
/** /**
@ -3076,7 +3070,15 @@ static void* thr_filewriter_fun(void* data)
do do
{ {
if (thr_flush_file(thr, lm, fwr, (logfile_id_t) i)) bool done = thr_flush_file(lm, fwr, (logfile_id_t) i);
if (!thr_flushall_check() && skygw_thread_must_exit(thr))
{
flushall_logfiles(true);
done = false;
}
if (done)
{ {
i <<= 1; i <<= 1;
} }