wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the stats log in lmkd am: 389aee1117 

am: 89c1ea6deb

Change-Id: I092f761249940703eb6388ba02a8d43f825ee519
This commit is contained in:
Yao Chen 2018-05-04 13:55:47 -07:00 committed by android-build-merger
parent b53f40a494 daf5980e0a
commit b67737a586
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@ -8,6 +8,7 @@ cc_binary {
], ],
static_libs: [ static_libs: [
"libstatslogc", "libstatslogc",
"libstatssocket",
], ],
local_include_dirs: ["include"], local_include_dirs: ["include"],
cflags: ["-Werror", "-DLMKD_TRACE_KILLS"], cflags: ["-Werror", "-DLMKD_TRACE_KILLS"],
@ -31,6 +32,7 @@ cc_library_static {
shared_libs: [ shared_libs: [
"liblog", "liblog",
], ],
static_libs: ["libstatssocket",],
} }
cc_library_static { cc_library_static {

2
lmkd.c
View File

@ -39,7 +39,7 @@
#include <log/log.h> #include <log/log.h>
#ifdef LMKD_LOG_STATS #ifdef LMKD_LOG_STATS
#include <statslog.h> #include "statslog.h"
#endif #endif
/* /*

29
statslog.c
View File

@ -16,8 +16,16 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <log/log_event_list.h>
#include <log/log_id.h> #include <log/log_id.h>
#include <stats_event_list.h>
#include <time.h>
static int64_t getElapsedRealTimeNs() {
struct timespec t;
t.tv_sec = t.tv_nsec = 0;
clock_gettime(CLOCK_BOOTTIME, &t);
return (int64_t)t.tv_sec * 1000000000LL + t.tv_nsec;
}
/** /**
* Logs the change in LMKD state which is used as start/stop boundaries for logging * Logs the change in LMKD state which is used as start/stop boundaries for logging
@ -32,6 +40,12 @@ stats_write_lmk_state_changed(android_log_context ctx, int32_t code, int32_t sta
return ret; return ret;
} }
reset_log_context(ctx);
if ((ret = android_log_write_int64(ctx, getElapsedRealTimeNs())) < 0) {
return ret;
}
if ((ret = android_log_write_int32(ctx, code)) < 0) { if ((ret = android_log_write_int32(ctx, code)) < 0) {
return ret; return ret;
} }
@ -39,7 +53,8 @@ stats_write_lmk_state_changed(android_log_context ctx, int32_t code, int32_t sta
if ((ret = android_log_write_int32(ctx, state)) < 0) { if ((ret = android_log_write_int32(ctx, state)) < 0) {
return ret; return ret;
} }
return ret;
return write_to_logger(ctx, LOG_ID_STATS);
} }
/** /**
@ -56,6 +71,11 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
if (!ctx) { if (!ctx) {
return ret; return ret;
} }
reset_log_context(ctx);
if ((ret = android_log_write_int64(ctx, getElapsedRealTimeNs())) < 0) {
return ret;
}
if ((ret = android_log_write_int32(ctx, code)) < 0) { if ((ret = android_log_write_int32(ctx, code)) < 0) {
return ret; return ret;
@ -93,8 +113,5 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
return ret; return ret;
} }
if ((ret = android_log_write_list(ctx, LOG_ID_STATS)) < 0) { return write_to_logger(ctx, LOG_ID_STATS);
return ret;
}
return ret;
} }

2
statslog.h
View File

@ -18,11 +18,11 @@
#define _STATSLOG_H_ #define _STATSLOG_H_
#include <assert.h> #include <assert.h>
#include <stats_event_list.h>
#include <stdbool.h> #include <stdbool.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <log/log_event_list.h>
__BEGIN_DECLS __BEGIN_DECLS