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

Manual merge from 0.4.

Browse Source
This commit is contained in:
Alexey Kopytov
2010-11-06 17:30:53 +03:00
parent 4655d17a6f 55389ac78f
commit eca9c2cc71
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysbench/db_driver.c
View File

@ -392,6 +392,7 @@ db_result_set_t *db_execute(db_stmt_t *stmt)
return rs;
}
/* Return the number of rows in a result set */

3
sysbench/sb_timer.c
View File

@ -21,6 +21,9 @@
#ifdef STDC_HEADERS
# include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif

10
sysbench/sysbench.c
View File

@ -147,8 +147,6 @@ static void print_header(void);
static void print_usage(void);
static void print_run_mode(sb_test_t *);
static void *report_thread_proc(void *arg);
#ifdef HAVE_ALARM
static void sigalrm_handler(int sig)
{
@ -405,9 +403,9 @@ static void *runner_thread(void *arg)
sb_thread_ctxt_t *ctxt;
sb_test_t *test;
unsigned int thread_id;
long long pause_ns;
long long period_ns = 0;
long long jitter_ns = 0;
long long pause_ns;
struct timespec target_tv, now_tv;
ctxt = (sb_thread_ctxt_t *)arg;
@ -424,8 +422,8 @@ static void *runner_thread(void *arg)
if (sb_globals.tx_rate > 0)
{
/* initialize tx_rate variables */
period_ns = (long long) round(1000000000.0 / sb_globals.tx_rate *
sb_globals.num_threads);
period_ns = round(1000000000.0 / sb_globals.tx_rate *
sb_globals.num_threads);
if (sb_globals.tx_jitter > 0)
jitter_ns = sb_globals.tx_jitter * 1000;
else
@ -494,7 +492,7 @@ static void *runner_thread(void *arg)
/* Intermediate reports thread */
void *report_thread_proc(void *arg)
static void *report_thread_proc(void *arg)
{
unsigned long long pause_ns;
unsigned long long prev_ns;