summaryrefslogtreecommitdiffstats
path: root/logd/LogBuffer.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-05 07:41:49 -0800
committerMark Salyzyn <salyzyn@google.com>2014-03-05 16:12:28 -0800
commit7e2f83c0bcc3ad8a2840a48be14d302ed79d671c (patch)
treee2d2ed4a9a9e218e046cb0796607cca8fc5ed97f /logd/LogBuffer.cpp
parent51ebffd8a5536af09b60950bf7cf6f020c962f8a (diff)
downloadcore-7e2f83c0bcc3ad8a2840a48be14d302ed79d671c.tar.gz
core-7e2f83c0bcc3ad8a2840a48be14d302ed79d671c.tar.bz2
core-7e2f83c0bcc3ad8a2840a48be14d302ed79d671c.zip
logd: liblog: 64-bit issues
- structure packing - move towards log_time from struct timespec - extend log_time to cover differences between log_time and struct timespec Change-Id: I106ed0b609917306d170044054b5b32645f2a295
Diffstat (limited to 'logd/LogBuffer.cpp')
-rw-r--r--logd/LogBuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 7340a36d8..c5760f7c1 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -36,7 +36,7 @@ LogBuffer::LogBuffer(LastLogTimes *times)
pthread_mutex_init(&mLogElementsLock, NULL);
}
-void LogBuffer::log(log_id_t log_id, struct timespec realtime,
+void LogBuffer::log(log_id_t log_id, log_time realtime,
uid_t uid, pid_t pid, const char *msg,
unsigned short len) {
if ((log_id >= LOG_ID_MAX) || (log_id < 0)) {
@@ -182,8 +182,8 @@ unsigned long LogBuffer::getSize(log_id_t /*id*/) {
return LOG_BUFFER_SIZE;
}
-struct timespec LogBuffer::flushTo(
- SocketClient *reader, const struct timespec start, bool privileged,
+log_time LogBuffer::flushTo(
+ SocketClient *reader, const log_time start, bool privileged,
bool (*filter)(const LogBufferElement *element, void *arg), void *arg) {
LogBufferElementCollection::iterator it;
log_time max = start;