summaryrefslogtreecommitdiff
path: root/utils/log_util.h
diff options
context:
space:
mode:
authorTushar Janefalkar <tusharj@codeaurora.org>2013-06-20 17:24:37 -0700
committerTushar Janefalkar <tusharj@codeaurora.org>2013-06-26 18:23:57 -0700
commit6fa0e8a9833271cc720c6ac751930b69395db096 (patch)
tree1eef5c94373f306a58f7bd46d26e1315d45177e6 /utils/log_util.h
parent711863f2f35d11a86b0b1f7a8b1e625ac200dc45 (diff)
downloadgps-6fa0e8a9833271cc720c6ac751930b69395db096.tar.gz
DEBUG_LEVEL 0 to produce no logs
In accordance to gps.conf, debug level of 0 now produces no logs at all. In addition, if the parameter DEBUG_LEVEL is commented in gps.conf, logs will be printed according to Android's logging levels CRs-fixed: 503157 Change-Id: I26ca2be67fbc7ce2bf633f66d9b88ca6450e9d27
Diffstat (limited to 'utils/log_util.h')
-rw-r--r--utils/log_util.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/utils/log_util.h b/utils/log_util.h
index 56dca62..8a9647c 100644
--- a/utils/log_util.h
+++ b/utils/log_util.h
@@ -78,23 +78,29 @@ extern char* get_timestamp(char* str, unsigned long buf_size);
#ifndef DEBUG_DMN_LOC_API
/* LOGGING MACROS */
-#define LOC_LOGE(...) ALOGE("E/"__VA_ARGS__)
+/*loc_logger.DEBUG_LEVEL is initialized to 0xff in loc_cfg.cpp
+ if that value remains unchanged, it means gps.conf did not
+ provide a value and we default to the initial value to use
+ Android's logging levels*/
+#define LOC_LOGE(...) \
+if ((loc_logger.DEBUG_LEVEL >= 1) && (loc_logger.DEBUG_LEVEL <= 5)) { ALOGE("W/"__VA_ARGS__); } \
+else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGE("W/"__VA_ARGS__); }
#define LOC_LOGW(...) \
-if (loc_logger.DEBUG_LEVEL >= 2) { ALOGE("W/"__VA_ARGS__); } \
-else if (loc_logger.DEBUG_LEVEL <= 0) { ALOGW("W/"__VA_ARGS__); }
+if ((loc_logger.DEBUG_LEVEL >= 2) && (loc_logger.DEBUG_LEVEL <= 5)) { ALOGE("W/"__VA_ARGS__); } \
+else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGW("W/"__VA_ARGS__); }
#define LOC_LOGI(...) \
-if (loc_logger.DEBUG_LEVEL >= 3) { ALOGE("I/"__VA_ARGS__); } \
-else if (loc_logger.DEBUG_LEVEL <= 0) { ALOGI("I/"__VA_ARGS__); }
+if ((loc_logger.DEBUG_LEVEL >= 3) && (loc_logger.DEBUG_LEVEL <= 5)) { ALOGE("I/"__VA_ARGS__); } \
+else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGI("I/"__VA_ARGS__); }
#define LOC_LOGD(...) \
-if (loc_logger.DEBUG_LEVEL >= 4) { ALOGE("D/"__VA_ARGS__); } \
-else if (loc_logger.DEBUG_LEVEL <= 0) { ALOGD("D/"__VA_ARGS__); }
+if ((loc_logger.DEBUG_LEVEL >= 4) && (loc_logger.DEBUG_LEVEL <= 5)) { ALOGE("D/"__VA_ARGS__); } \
+else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGD("D/"__VA_ARGS__); }
#define LOC_LOGV(...) \
-if (loc_logger.DEBUG_LEVEL >= 5) { ALOGE("V/"__VA_ARGS__); } \
-else if (loc_logger.DEBUG_LEVEL <= 0) { ALOGV("V/"__VA_ARGS__); }
+if ((loc_logger.DEBUG_LEVEL >= 5) && (loc_logger.DEBUG_LEVEL <= 5)) { ALOGE("V/"__VA_ARGS__); } \
+else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGV("V/"__VA_ARGS__); }
#else /* DEBUG_DMN_LOC_API */