pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fc_timedwait_ms must call get_current_time_ms()

pull/37/head V1.0.44
YuQing 2020-12-11 11:36:12 +08:00
parent 0cd65f088c
commit 3e192fae09
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pthread_func.h
View File

@ -23,8 +23,9 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "common_define.h" #include "common_define.h"
#include "logger.h" #include "shared_func.h"
#include "sched_thread.h" #include "sched_thread.h"
#include "logger.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -83,11 +84,13 @@ static inline void fc_timedwait_sec(pthread_mutex_t *lock,
static inline void fc_timedwait_ms(pthread_mutex_t *lock, static inline void fc_timedwait_ms(pthread_mutex_t *lock,
pthread_cond_t *cond, const int timeout_ms) pthread_cond_t *cond, const int timeout_ms)
{ {
int64_t expires_ms;
struct timespec ts; struct timespec ts;
expires_ms = get_current_time_ms() + timeout_ms;
PTHREAD_MUTEX_LOCK(lock); PTHREAD_MUTEX_LOCK(lock);
ts.tv_sec = get_current_time() + timeout_ms / 1000; ts.tv_sec = expires_ms / 1000;
ts.tv_nsec = (timeout_ms % 1000) * (1000 * 1000); ts.tv_nsec = (expires_ms % 1000) * (1000 * 1000);
pthread_cond_timedwait(cond, lock, &ts); pthread_cond_timedwait(cond, lock, &ts);
PTHREAD_MUTEX_UNLOCK(lock); PTHREAD_MUTEX_UNLOCK(lock);
} }