Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 19:54:57 +08:00
Code Issues Projects Releases Wiki Activity

Beginnings of some operator functions for timespec structs

Browse Source
This commit is contained in:
Mike Purvis 2013-10-06 08:54:48 -04:00
parent 8f01d23249
commit 10f2fc60fb
1 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/impl/unix.cc
View File

@ -425,6 +425,45 @@ diff_timespec (timespec &start, timespec &end, timespec &result) {
}
}
/*! Simple function to normalize the tv_nsec field to [0..1e9), carrying
* the remainder into the tv_sec field. */
void normalize(timespec* ts) {
while (ts->tv_nsec < 0) {
ts->tv_nsec += 1e9;
ts->tv_sec -= 1;
}
while (ts->tv_nsec >= 1e9) {
ts->tv_nsec -= 1e9;
ts->tv_sec += 1;
}
}
inline struct timespec
operator+ (const struct timespec &a, const struct timespec &b) {
struct timespec result = { a.tv_sec + b.tv_sec,
a.tv_nsec + b.tv_nsec };
normalize(&result);
return result;
}
inline struct timespec
operator- (const struct timespec &a, const struct timespec &b) {
struct timespec result = { a.tv_sec - b.tv_sec,
a.tv_nsec - b.tv_nsec };
normalize(&result);
return result;
}
inline struct timespec
min (const struct timespec &a, const struct timespec &b) {
if (a.tv_sec < b.tv_sec
|| (a.tv_sec == b.tv_sec && a.tv_nsec < b.tv_nsec)) {
return a;
} else {
return b;
}
}
size_t
Serial::SerialImpl::read (uint8_t *buf, size_t size)
{
@ -473,8 +512,8 @@ Serial::SerialImpl::read (uint8_t *buf, size_t size)
// Calculate difference and update the structure
get_time_now (end);
// Calculate the time select took
struct timespec diff;
diff_timespec (start, end, diff);
struct timespec diff(end - start);
// Update the timeout
if (total_timeout.tv_sec <= diff.tv_sec) {
total_timeout.tv_sec = 0;