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

am 15704b1b: am d9bb6770: Merge "logd: 64-bit compile issue"

Browse source 
* commit '15704b1bdfc7ddf080d50f7a5cf478dfb6608962':
  logd: 64-bit compile issue
This commit is contained in:
Mark Salyzyn 2014-05-02 21:49:16 +00:00 • committed by Android Git Automerger
commit 218524778a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/log/log_read.h
View file

@ -33,6 +33,9 @@ public:
uint32_t tv_sec; // good to Feb 5 2106 uint32_t tv_sec; // good to Feb 5 2106
uint32_t tv_nsec; uint32_t tv_nsec;
static const uint32_t tv_sec_max = 0xFFFFFFFFUL;
static const uint32_t tv_nsec_max = 999999999UL;
log_time(const timespec &T) log_time(const timespec &T)
{ {
tv_sec = T.tv_sec; tv_sec = T.tv_sec;

6
logd/LogStatistics.cpp
View file

@ -392,8 +392,8 @@ LogStatistics::LogStatistics()
dgram_qlen_statistics = false; dgram_qlen_statistics = false;
for(unsigned short bucket = 0; dgram_qlen(bucket); ++bucket) { for(unsigned short bucket = 0; dgram_qlen(bucket); ++bucket) {
mMinimum[bucket].tv_sec = (uint32_t)-1; mMinimum[bucket].tv_sec = mMinimum[bucket].tv_sec_max;
mMinimum[bucket].tv_nsec = 999999999UL; mMinimum[bucket].tv_nsec = mMinimum[bucket].tv_nsec_max;
} }
} }
@ -439,7 +439,7 @@ unsigned short LogStatistics::dgram_qlen(unsigned short bucket) {
} }
unsigned long long LogStatistics::minimum(unsigned short bucket) { unsigned long long LogStatistics::minimum(unsigned short bucket) {
if (mMinimum[bucket].tv_sec == LONG_MAX) { if (mMinimum[bucket].tv_sec == mMinimum[bucket].tv_sec_max) {
return 0; return 0;
} }
return mMinimum[bucket].nsec(); return mMinimum[bucket].nsec();