ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: Add log_time += operator"

Browse source
This commit is contained in:
Mark Salyzyn 2015-01-05 20:18:24 +00:00 • committed by Gerrit Code Review
commit e892279b3a
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/log/log_read.h
View file

@ -100,6 +100,12 @@ public:
log_time local(*this); log_time local(*this);
return local -= T; return local -= T;
} }
log_time operator+= (const timespec &T);
log_time operator+ (const timespec &T) const
{
log_time local(*this);
return local += T;
}
// log_time // log_time
bool operator== (const log_time &T) const bool operator== (const log_time &T) const
@ -134,6 +140,12 @@ public:
log_time local(*this); log_time local(*this);
return local -= T; return local -= T;
} }
log_time operator+= (const log_time &T);
log_time operator+ (const log_time &T) const
{
log_time local(*this);
return local += T;
}
uint64_t nsec() const uint64_t nsec() const
{ {

22
liblog/log_time.cpp
View file

@ -150,6 +150,17 @@ log_time log_time::operator-= (const timespec &T) {
return *this; return *this;
} }
log_time log_time::operator+= (const timespec &T) {
this->tv_nsec += (unsigned long int)T.tv_nsec;
if (this->tv_nsec >= NS_PER_SEC) {
this->tv_nsec -= NS_PER_SEC;
++this->tv_sec;
}
this->tv_sec += T.tv_sec;
return *this;
}
log_time log_time::operator-= (const log_time &T) { log_time log_time::operator-= (const log_time &T) {
// No concept of negative time, clamp to EPOCH // No concept of negative time, clamp to EPOCH
if (*this <= T) { if (*this <= T) {
@ -166,3 +177,14 @@ log_time log_time::operator-= (const log_time &T) {
return *this; return *this;
} }
log_time log_time::operator+= (const log_time &T) {
this->tv_nsec += T.tv_nsec;
if (this->tv_nsec >= NS_PER_SEC) {
this->tv_nsec -= NS_PER_SEC;
++this->tv_sec;
}
this->tv_sec += T.tv_sec;
return *this;
}