Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qbtimer.h | 8 ++++----
include/tlist.h | 38 +++++++++++++++++++-------------------
lib/ipc_int.h | 2 +-
lib/poll.c | 4 ++--
lib/timer.c | 12 ++++++------
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/include/qb/qbtimer.h b/include/qb/qbtimer.h
index 6f1576f..a131dea 100644
--- a/include/qb/qbtimer.h
+++ b/include/qb/qbtimer.h
@@ -33,12 +33,12 @@ typedef void *qb_timer_handle;
int qb_timer_init(void (*serialize_lock) (void),
void (*serialize_unlock) (void), int sched_priority);
-int qb_timer_add_duration(unsigned long long nanosec_duration,
+int qb_timer_add_duration(uint64_t nanosec_duration,
void *data,
void (*timer_fn) (void *data),
qb_timer_handle * handle);
-int qb_timer_add_absolute(unsigned long long nanoseconds_from_epoch,
+int qb_timer_add_absolute(uint64_t nanoseconds_from_epoch,
void *data,
void (*timer_fn) (void *data),
qb_timer_handle * handle);
@@ -51,9 +51,9 @@ void qb_timer_lock(void);
void qb_timer_unlock(void);
-unsigned long long qb_timer_time_get(void);
+uint64_t qb_timer_time_get(void);
-unsigned long long qb_timer_expire_time_get(qb_timer_handle handle);
+uint64_t qb_timer_expire_time_get(qb_timer_handle handle);
/* *INDENT-OFF* */
#ifdef __cplusplus
diff --git a/include/tlist.h b/include/tlist.h
index 3a26300..b4674bd 100644
--- a/include/tlist.h
+++ b/include/tlist.h
@@ -55,7 +55,7 @@ struct timerlist {
struct timerlist_timer {
struct qb_list_head list;
- unsigned long long expire_time;
+ uint64_t expire_time;
int is_absolute_timer;
void (*timer_fn) (void *data);
void *data;
@@ -67,9 +67,9 @@ static inline void timerlist_init(struct timerlist *timerlist)
qb_list_init(&timerlist->timer_head);
}
-static inline unsigned long long timerlist_nano_from_epoch(void)
+static inline uint64_t timerlist_nano_from_epoch(void)
{
- unsigned long long nano_from_epoch;
+ uint64_t nano_from_epoch;
struct timeval time_from_epoch;
gettimeofday(&time_from_epoch, 0);
@@ -80,21 +80,21 @@ static inline unsigned long long timerlist_nano_from_epoch(void)
}
#if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
-static inline unsigned long long timerlist_nano_current_get(void)
+static inline uint64_t timerlist_nano_current_get(void)
{
- unsigned long long nano_monotonic;
+ uint64_t nano_monotonic;
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
nano_monotonic =
- (ts.tv_sec * TIMERLIST_NS_IN_SEC) + (unsigned long long)ts.tv_nsec;
+ (ts.tv_sec * TIMERLIST_NS_IN_SEC) + (uint64_t)ts.tv_nsec;
return (nano_monotonic);
}
-static inline unsigned long long timerlist_nano_monotonic_hz(void)
+static inline uint64_t timerlist_nano_monotonic_hz(void)
{
- unsigned long long nano_monotonic_hz;
+ uint64_t nano_monotonic_hz;
struct timespec ts;
clock_getres(CLOCK_MONOTONIC, &ts);
@@ -107,12 +107,12 @@ static inline unsigned long long timerlist_nano_monotonic_hz(void)
}
#else
#warning "Your system doesn't support monotonic timer. gettimeofday will be
used"
-static inline unsigned long long timerlist_nano_current_get(void)
+static inline uint64_t timerlist_nano_current_get(void)
{
return (timerlist_nano_from_epoch());
}
-static inline unsigned long long timerlist_nano_monotonic_hz(void)
+static inline uint64_t timerlist_nano_monotonic_hz(void)
{
return HZ;
}
@@ -146,7 +146,7 @@ static inline void timerlist_add(struct timerlist *timerlist,
static inline int timerlist_add_absolute(struct timerlist *timerlist,
void (*timer_fn) (void *data),
void *data,
- unsigned long long nano_from_epoch,
+ uint64_t nano_from_epoch,
timer_handle * handle)
{
struct timerlist_timer *timer;
@@ -172,7 +172,7 @@ static inline int timerlist_add_absolute(struct timerlist *timerlist,
static inline int timerlist_add_duration(struct timerlist *timerlist,
void (*timer_fn) (void *data),
void *data,
- unsigned long long nano_duration,
+ uint64_t nano_duration,
timer_handle * handle)
{
struct timerlist_timer *timer;
@@ -214,7 +214,7 @@ static inline void timerlist_del(struct timerlist *timerlist,
free(timer);
}
-static inline unsigned long long timerlist_expire_time(struct timerlist
+static inline uint64_t timerlist_expire_time(struct timerlist
*timerlist,
timer_handle
_timer_handle)
@@ -245,13 +245,13 @@ static inline void timerlist_post_dispatch(struct timerlist
*timerlist,
/*
* returns the number of msec until the next timer will expire for use with poll
*/
-static inline unsigned long long timerlist_msec_duration_to_expire(struct
+static inline uint64_t timerlist_msec_duration_to_expire(struct
timerlist
*timerlist)
{
struct timerlist_timer *timer_from_list;
- volatile unsigned long long current_time;
- volatile unsigned long long msec_duration_to_expire;
+ volatile uint64_t current_time;
+ volatile uint64_t msec_duration_to_expire;
/*
* empty list, no expire
@@ -288,9 +288,9 @@ static inline unsigned long long
timerlist_msec_duration_to_expire(struct
static inline void timerlist_expire(struct timerlist *timerlist)
{
struct timerlist_timer *timer_from_list;
- unsigned long long current_time_from_epoch;
- unsigned long long current_monotonic_time;
- unsigned long long current_time;
+ uint64_t current_time_from_epoch;
+ uint64_t current_monotonic_time;
+ uint64_t current_time;
current_monotonic_time = timerlist_nano_current_get();
current_time_from_epoch = current_time = timerlist_nano_from_epoch();
diff --git a/lib/ipc_int.h b/lib/ipc_int.h
index 41b9dcc..bedb8d5 100644
--- a/lib/ipc_int.h
+++ b/lib/ipc_int.h
@@ -69,7 +69,7 @@ enum res_init_types {
typedef struct {
int service __attribute__ ((aligned(8)));
- unsigned long long semkey __attribute__ ((aligned(8)));
+ uint64_t semkey __attribute__ ((aligned(8)));
char control_file[64] __attribute__ ((aligned(8)));
char request_file[64] __attribute__ ((aligned(8)));
char response_file[64] __attribute__ ((aligned(8)));
diff --git a/lib/poll.c b/lib/poll.c
index 640fe20..023c627 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -279,7 +279,7 @@ int qb_poll_timer_add(qb_handle_t handle,
timerlist_add_duration(&poll_instance->timerlist,
timer_fn, data,
- ((unsigned long long)msec_duration) * 1000000ULL,
+ ((uint64_t)msec_duration) * 1000000ULL,
timer_handle_out);
qb_hdb_handle_put(&poll_instance_database, handle);
@@ -333,7 +333,7 @@ int qb_poll_run(qb_handle_t handle)
{
struct qb_poll_instance *poll_instance;
int i;
- unsigned long long expire_timeout_msec = -1;
+ uint64_t expire_timeout_msec = -1;
int res;
int poll_entry_count;
diff --git a/lib/timer.c b/lib/timer.c
index 96a52d3..b9dba2f 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -59,7 +59,7 @@ extern void pthread_exit(void *) __attribute__ ((noreturn));
static void *prioritized_timer_thread(void *data)
{
int fds;
- unsigned long long timeout;
+ uint64_t timeout;
#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
if (sched_priority != 0) {
@@ -126,7 +126,7 @@ int qb_timer_init(void (*serialize_lock_fn) (void),
return (res);
}
-int qb_timer_add_absolute(unsigned long long nanosec_from_epoch,
+int qb_timer_add_absolute(uint64_t nanosec_from_epoch,
void *data,
void (*timer_fn) (void *data), timer_handle * handle)
{
@@ -153,7 +153,7 @@ int qb_timer_add_absolute(unsigned long long nanosec_from_epoch,
return (res);
}
-int qb_timer_add_duration(unsigned long long nanosec_duration,
+int qb_timer_add_duration(uint64_t nanosec_duration,
void *data,
void (*timer_fn) (void *data), timer_handle * handle)
{
@@ -211,15 +211,15 @@ void qb_timer_unlock(void)
pthread_mutex_unlock(&timer_mutex);
}
-unsigned long long qb_timer_time_get(void)
+uint64_t qb_timer_time_get(void)
{
return (timerlist_nano_from_epoch());
}
-unsigned long long qb_timer_expire_time_get(timer_handle th)
+uint64_t qb_timer_expire_time_get(timer_handle th)
{
int unlock;
- unsigned long long expire;
+ uint64_t expire;
if (th == 0) {
return (0);
--
1.6.6.1