From 9763aef76a42fdaedcec9825fdf502f8cb7dd628 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sun, 15 Nov 2009 03:42:45 -0800 Subject: [PATCH] helper/log: improve API parameter types Uses unsigned type to pass line numbers. Use uint64_t to pass sleep routines their milliseconds. Updates sleep routines to use this type and improve whitespace. --- src/helper/log.c | 27 ++++++++++++--------------- src/helper/log.h | 8 ++++---- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/helper/log.c b/src/helper/log.c index 5a65c87e..9396ffe9 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -77,7 +77,7 @@ struct store_log_forward }; /* either forward the log to the listeners or store it for possible forwarding later */ -static void log_forward(const char *file, int line, const char *function, const char *string) +static void log_forward(const char *file, unsigned line, const char *function, const char *string) { if (log_forward_count==0) { @@ -224,7 +224,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch } -void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) +void log_printf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) { char *string; va_list ap; @@ -245,7 +245,7 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f va_end(ap); } -void log_printf_lf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) +void log_printf_lf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) { char *string; va_list ap; @@ -504,27 +504,24 @@ void kept_alive() } /* if we sleep for extended periods of time, we must invoke keep_alive() intermittantly */ -void alive_sleep(int ms) +void alive_sleep(uint64_t ms) { - int i; - int napTime = 10; - for (i = 0; i < ms; i += napTime) + uint64_t napTime = 10; + for (uint64_t i = 0; i < ms; i += napTime) { - int sleep_a_bit = ms-i; + uint64_t sleep_a_bit = ms - i; if (sleep_a_bit > napTime) - { sleep_a_bit = napTime; - } - usleep(sleep_a_bit*1000); + + usleep(sleep_a_bit * 1000); keep_alive(); } } -void busy_sleep(int ms) +void busy_sleep(uint64_t ms) { - long long then; - then = timeval_ms(); - while ((timeval_ms()-then) < ms) + uint64_t then = timeval_ms(); + while (timeval_ms() - then < ms) { /* busy wait */ } diff --git a/src/helper/log.h b/src/helper/log.h index 3bf9840a..6f7c24a8 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -59,10 +59,10 @@ enum log_levels LOG_LVL_DEBUG = 3 }; -void log_printf(enum log_levels level, const char *file, int line, +void log_printf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); -void log_printf_lf(enum log_levels level, const char *file, int line, +void log_printf_lf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); @@ -74,8 +74,8 @@ int log_register_commands(struct command_context *cmd_ctx); void keep_alive(void); void kept_alive(void); -void alive_sleep(int ms); -void busy_sleep(int ms); +void alive_sleep(uint64_t ms); +void busy_sleep(uint64_t ms); /* log entries can be paused and replayed roughly according to the try/catch/rethrow * concepts in C++ -- 2.39.5