kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Use new Time class in timed_wait()

Browse source 
And simplify the code.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-03-03 18:53:37 +01:00
parent 19540c9ee8
commit 482b5b7ece
3 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/misc.cpp
View file

@ -138,19 +138,11 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
#if defined(_WIN32) || defined(_WIN64)
int tm = msec;
#else
struct timeval t;
struct timespec abstime, *tm = &abstime;
timespec ts, *tm = &ts;
uint64_t ms = Time::current_time().msec() + msec;
gettimeofday(&t, NULL);
abstime.tv_sec = t.tv_sec + (msec / 1000);
abstime.tv_nsec = (t.tv_usec + (msec % 1000) * 1000) * 1000;
if (abstime.tv_nsec > 1000000000LL)
{
abstime.tv_sec += 1;
abstime.tv_nsec -= 1000000000LL;
}
ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms % 1000) * 1000000LL;
#endif
cond_timedwait(sleepCond, sleepLock, tm);

2
src/misc.h
View file

@ -57,7 +57,7 @@ public:
static Time current_time() { Time t; t.restart(); return t; }
private:
my_time_t t;
sys_time_t t;
};
#endif // !defined(MISC_H_INCLUDED)

12
src/types.h
View file

@ -62,16 +62,16 @@ typedef unsigned __int64 uint64_t;
#if defined(_WIN32) || defined(_WIN64)
# include <sys/timeb.h>
typedef _timeb my_time_t;
typedef _timeb sys_time_t;
inline void system_time(my_time_t* t) { _ftime(t); }
inline uint64_t time_to_msec(const my_time_t& t) { return t.time * 1000 + t.millitm; }
inline void system_time(sys_time_t* t) { _ftime(t); }
inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000 + t.millitm; }
#else
# include <sys/time.h>
typedef timeval my_time_t;
typedef timeval sys_time_t;
inline void system_time(my_time_t* t) { gettimeofday(t, NULL); }
inline uint64_t time_to_msec(const my_time_t& t) { return t.tv_sec * 1000 + t.tv_usec / 1000; }
inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000 + t.tv_usec / 1000; }
#endif
#if defined(_WIN64)