From 55389ac78f164d1ae7abbb487a44317c9907647b Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 6 Nov 2010 17:10:38 +0300 Subject: [PATCH] Fixed compiler warnings. --- sysbench/db_driver.c | 37 --------------------- sysbench/db_driver.h | 14 ++++++++ sysbench/sb_timer.c | 8 +++-- sysbench/sysbench.c | 53 ++++++++++--------------------- sysbench/tests/fileio/sb_fileio.c | 2 -- sysbench/tests/oltp/sb_oltp.c | 4 +-- 6 files changed, 37 insertions(+), 81 deletions(-) diff --git a/sysbench/db_driver.c b/sysbench/db_driver.c index 19a7275..6bb8c45 100644 --- a/sysbench/db_driver.c +++ b/sysbench/db_driver.c @@ -34,20 +34,6 @@ db_globals_t db_globals; static sb_list_t drivers; /* list of available DB drivers */ -/* DB drivers registrars */ - -#ifdef USE_MYSQL -int register_driver_mysql(sb_list_t *); -#endif - -#ifdef USE_ORACLE -int register_driver_oracle(sb_list_t *); -#endif - -#ifdef USE_PGSQL -int register_driver_pgsql(sb_list_t *); -#endif - /* Static functions */ static int db_parse_arguments(void); @@ -320,29 +306,6 @@ db_result_set_t *db_execute(db_stmt_t *stmt) } -/* Fetch row into buffers bound by db_bind() */ - - -int db_fetch(db_result_set_t *rs) -{ - db_conn_t *con; - - /* Is this a result set from a prepared statement? */ - if (rs->statement == NULL) - return 1; - - con = rs->connection; - if (con == NULL || con->driver == NULL) - return 1; - - if (!rs->statement->emulated) - return con->driver->ops.fetch(rs); - - /* NYI: Use emulation */ - return 1; -} - - /* Return the number of rows in a result set */ diff --git a/sysbench/db_driver.h b/sysbench/db_driver.h index dcd177c..4297a0e 100644 --- a/sysbench/db_driver.h +++ b/sysbench/db_driver.h @@ -263,4 +263,18 @@ db_error_t db_errno(db_conn_t *); int db_print_value(db_bind_t *, char *, int); +/* DB drivers registrars */ + +#ifdef USE_MYSQL +int register_driver_mysql(sb_list_t *); +#endif + +#ifdef USE_ORACLE +int register_driver_oracle(sb_list_t *); +#endif + +#ifdef USE_PGSQL +int register_driver_pgsql(sb_list_t *); +#endif + #endif /* DB_DRIVER_H */ diff --git a/sysbench/sb_timer.c b/sysbench/sb_timer.c index 9dde842..a9443bd 100644 --- a/sysbench/sb_timer.c +++ b/sysbench/sb_timer.c @@ -23,6 +23,10 @@ # include #endif +#ifdef HAVE_STRING_H +# include +#endif + #include "sb_logger.h" #include "sb_timer.h" @@ -108,8 +112,6 @@ void sb_timer_stop(sb_timer_t *t) unsigned long long sb_timer_value(sb_timer_t *t) { - struct timespec time_end; - switch (t->state) { case TIMER_INITIALIZED: log_text(LOG_WARNING, "timer was never started"); @@ -208,6 +210,7 @@ sb_timer_t merge_timers(sb_timer_t *t1, sb_timer_t *t2) { sb_timer_t t; + memset(&t, 0, sizeof(sb_timer_t)); t.elapsed = t1->elapsed + t2->elapsed; t.sum_time = t1->sum_time+t2->sum_time; t.events = t1->events+t2->events; @@ -232,7 +235,6 @@ sb_timer_t merge_timers(sb_timer_t *t1, sb_timer_t *t2) void add_ns_to_timespec(struct timespec *dest, long long delta) { long long x; - time_t sec; x = dest->tv_nsec + delta; if (x > 1000000000) diff --git a/sysbench/sysbench.c b/sysbench/sysbench.c index d5b2d3b..5d2bbe1 100644 --- a/sysbench/sysbench.c +++ b/sysbench/sysbench.c @@ -138,7 +138,7 @@ static void sigalrm_handler(int sig) /* Main request provider function */ -sb_request_t get_request(sb_test_t *test, int thread_id) +static sb_request_t get_request(sb_test_t *test, int thread_id) { sb_request_t r; (void)thread_id; /* unused */ @@ -158,7 +158,7 @@ sb_request_t get_request(sb_test_t *test, int thread_id) /* Main request execution function */ -int execute_request(sb_test_t *test, sb_request_t *r,int thread_id) +static int execute_request(sb_test_t *test, sb_request_t *r,int thread_id) { unsigned int rc; @@ -174,15 +174,7 @@ int execute_request(sb_test_t *test, sb_request_t *r,int thread_id) } -int register_test(sb_test_t *test) -{ - SB_LIST_ADD_TAIL(&test->listitem, &tests); - - return 0; -} - - -int register_tests(void) +static int register_tests(void) { SB_LIST_INIT(&tests); @@ -236,22 +228,7 @@ void print_usage(void) } -sb_arg_t *find_argument(char *name, sb_arg_t *args) -{ - unsigned int i; - - if (args == NULL) - return NULL; - - for (i = 0; args[i].name != NULL; i++) - if (!strcasecmp(args[i].name, name)) - return &(args[i]); - - return NULL; -} - - -sb_cmd_t parse_command(char *cmd) +static sb_cmd_t parse_command(char *cmd) { if (!strcmp(cmd, "prepare")) return SB_COMMAND_PREPARE; @@ -268,7 +245,7 @@ sb_cmd_t parse_command(char *cmd) } -int parse_arguments(int argc, char *argv[]) +static int parse_arguments(int argc, char *argv[]) { int i; char *name; @@ -394,14 +371,16 @@ void print_run_mode(sb_test_t *test) /* Main runner test thread */ -void *runner_thread(void *arg) +static void *runner_thread(void *arg) { sb_request_t request; sb_thread_ctxt_t *ctxt; sb_test_t *test; unsigned int thread_id; - long long period_ns, pause_ns, jitter_ns; - struct timespec target_tv, now_tv, wakeup_tv; + 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; test = ctxt->test; @@ -417,8 +396,8 @@ 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 @@ -487,7 +466,7 @@ 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; @@ -533,7 +512,7 @@ void *report_thread_proc(void *arg) Wait for them to complete and measure time */ -int run_test(sb_test_t *test) +static int run_test(sb_test_t *test) { unsigned int i; int err; @@ -654,7 +633,7 @@ int run_test(sb_test_t *test) } -sb_test_t *find_test(char *name) +static sb_test_t *find_test(char *name) { sb_list_item_t *pos; sb_test_t *test; @@ -670,7 +649,7 @@ sb_test_t *find_test(char *name) } -int init(void) +static int init(void) { option_t *opt; char *tmp; diff --git a/sysbench/tests/fileio/sb_fileio.c b/sysbench/tests/fileio/sb_fileio.c index caa45a3..2b857c7 100644 --- a/sysbench/tests/fileio/sb_fileio.c +++ b/sysbench/tests/fileio/sb_fileio.c @@ -25,8 +25,6 @@ #ifdef STDC_HEADERS # include -/* Required for memalign to be declared on Solaris */ -#define __EXTENSIONS__ # include #endif diff --git a/sysbench/tests/oltp/sb_oltp.c b/sysbench/tests/oltp/sb_oltp.c index f98ed6b..a523771 100644 --- a/sysbench/tests/oltp/sb_oltp.c +++ b/sysbench/tests/oltp/sb_oltp.c @@ -278,7 +278,7 @@ static sb_request_t get_request_nontrx(int); static sb_request_t get_request_sp(int); /* Adds a 'reconnect' request to the list of SQL queries */ -static inline int add_reconnect_req(sb_list_t *list); +int add_reconnect_req(sb_list_t *list); /* Get random 'user think' time */ static int get_think_time(void); @@ -769,7 +769,7 @@ sb_request_t oltp_get_request(int tid) } -inline int add_reconnect_req(sb_list_t *list) +int add_reconnect_req(sb_list_t *list) { sb_sql_query_t *query;