cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwTime.cpp : Fix advanceMicros() and advanceMs()

Browse Source
This commit is contained in:
kevin 2024-09-13 15:09:56 -04:00
parent e0063a078f
commit e98db94c92
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cwTime.cpp
View File

@ -262,15 +262,12 @@ void cw::time::subtractMicros( spec_t& ts, unsigned micros )
void cw::time::advanceMicros( spec_t& ts, unsigned us ) void cw::time::advanceMicros( spec_t& ts, unsigned us )
{ {
const unsigned us_per_sec = 1000000;
const unsigned ns_per_sec = 1000000000; const unsigned ns_per_sec = 1000000000;
unsigned sec = us / us_per_sec;
ts.tv_sec += sec; ts.tv_nsec += us * 1000; // convert us to nano's
ts.tv_nsec += (us - sec*us_per_sec)*1000;
sec = ts.tv_nsec / ns_per_sec; // check if nano's now have more than ns_pser_sec
time_t sec = ts.tv_nsec / ns_per_sec;
ts.tv_sec += sec; ts.tv_sec += sec;
ts.tv_nsec -= sec * ns_per_sec; ts.tv_nsec -= sec * ns_per_sec;
@ -281,18 +278,14 @@ void cw::time::advanceMicros( spec_t& ts, unsigned us )
void cw::time::advanceMs( spec_t& ts, unsigned ms ) void cw::time::advanceMs( spec_t& ts, unsigned ms )
{ {
const unsigned ms_per_sec = 1000;
const unsigned ns_per_sec = 1000000000; const unsigned ns_per_sec = 1000000000;
unsigned sec = ms / ms_per_sec; ts.tv_nsec += ms * 1000000;
time_t sec = ts.tv_nsec / ns_per_sec;
ts.tv_sec += sec;
ts.tv_nsec += (ms - (sec*ms_per_sec)) * 1000000;
sec = ts.tv_nsec / ns_per_sec;
ts.tv_sec += sec; ts.tv_sec += sec;
ts.tv_nsec -= sec * ns_per_sec; ts.tv_nsec -= sec * ns_per_sec;
} }
cw::rc_t cw::time::futureMs( spec_t& ts, unsigned ms ) cw::rc_t cw::time::futureMs( spec_t& ts, unsigned ms )