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

Delay killing the --report-interval thread until the very end of

Browse Source 
run_test() to avoid mutex lock leaks.
This commit is contained in:
Alexey Kopytov
2011-04-19 13:29:19 +04:00
parent c4bb8a246c
commit ae40add564
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sysbench/sysbench.c
View File

@ -493,7 +493,12 @@ static void *report_thread_proc(void *arg)
for (;;)
{
usleep(pause_ns / 1000);
current_test->ops.print_stats(SB_STAT_INTERMEDIATE);
/*
sb_globals.report_interval may be set to 0 by the master thread
to silence report at the end of the test
*/
if (sb_globals.report_interval > 0)
current_test->ops.print_stats(SB_STAT_INTERMEDIATE);
curr_ns = sb_timer_value(&sb_globals.exec_timer);
do
{
@ -517,6 +522,7 @@ static int run_test(sb_test_t *test)
unsigned int i;
int err;
pthread_t report_thread;
int report_thread_created = 0;
/* initialize test */
if (test->ops.init != NULL && test->ops.init() != 0)
@ -566,6 +572,7 @@ static int run_test(sb_test_t *test)
log_errno(LOG_FATAL, "pthread_create() for the reporting thread failed.");
return 1;
}
report_thread_created = 1;
}
/* Starting the test threads */
@ -601,11 +608,8 @@ static int run_test(sb_test_t *test)
sb_timer_stop(&sb_globals.exec_timer);
if (sb_globals.report_interval > 0)
{
if (pthread_cancel(report_thread) || pthread_join(report_thread, NULL))
log_errno(LOG_FATAL, "Terminating the reporting thread failed.");
}
/* Silence periodic reports if they were on */
sb_globals.report_interval = 0;
#ifdef HAVE_ALARM
alarm(0);
@ -628,7 +632,14 @@ static int run_test(sb_test_t *test)
/* finalize test */
if (test->ops.done != NULL)
(*(test->ops.done))();
/* Delay killing the reporting thread to avoid mutex lock leaks */
if (report_thread_created)
{
if (pthread_cancel(report_thread) || pthread_join(report_thread, NULL))
log_errno(LOG_FATAL, "Terminating the reporting thread failed.");
}
return sb_globals.error != 0;
}