summaryrefslogtreecommitdiffstats
path: root/liblog/log_read_kern.c
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-02-11 12:29:31 -0800
committerMark Salyzyn <salyzyn@google.com>2014-03-13 14:48:07 -0700
commitdfa7a07f5be656cfafdb4e75916bc9dcd9e592e7 (patch)
treea8e488d706cad455822767ee92ba198acb58f3b7 /liblog/log_read_kern.c
parent64d6fe936253b336049c285369a56cf139bd002f (diff)
downloadsystem_core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.zip
system_core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.tar.gz
system_core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.tar.bz2
logd: liblog: logcat: Add LogWhiteBlackList
- liblog android_logger_get_log_size and android_logger_get_readable_size adjusted to return long instead of int because of -G flag extending range NB: ifdef'd only for userdebug and eng builds - liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size - logcat Add -P, -p and -G flags - logd Add LogWhiteBlackList and configurable log size (cherry picked from commit 18a5432158ad43b8faefe4950b30e760200ce0b4) Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
Diffstat (limited to 'liblog/log_read_kern.c')
-rw-r--r--liblog/log_read_kern.c35
1 files changed, 32 insertions, 3 deletions
diff --git a/liblog/log_read_kern.c b/liblog/log_read_kern.c
index 59a7a0b..483b6b6 100644
--- a/liblog/log_read_kern.c
+++ b/liblog/log_read_kern.c
@@ -227,16 +227,26 @@ int android_logger_clear(struct logger *logger)
}
/* returns the total size of the log's ring buffer */
-int android_logger_get_log_size(struct logger *logger)
+long android_logger_get_log_size(struct logger *logger)
{
return logger_ioctl(logger, LOGGER_GET_LOG_BUF_SIZE, O_RDWR);
}
+#ifdef USERDEBUG_BUILD
+
+int android_logger_set_log_size(struct logger *logger UNUSED,
+ unsigned long size UNUSED)
+{
+ return -ENOTSUP;
+}
+
+#endif /* USERDEBUG_BUILD */
+
/*
* returns the readable size of the log's ring buffer (that is, amount of the
* log consumed)
*/
-int android_logger_get_log_readable_size(struct logger *logger)
+long android_logger_get_log_readable_size(struct logger *logger)
{
return logger_ioctl(logger, LOGGER_GET_LOG_LEN, O_RDONLY);
}
@@ -253,15 +263,34 @@ int android_logger_get_log_version(struct logger *logger)
/*
* returns statistics
*/
+static const char unsupported[] = "18\nNot Supported\n\f";
ssize_t android_logger_get_statistics(struct logger_list *logger_list UNUSED,
char *buf, size_t len)
{
- static const char unsupported[] = "18\nNot Supported\n\f";
strncpy(buf, unsupported, len);
return -ENOTSUP;
}
+#ifdef USERDEBUG_BUILD
+
+ssize_t android_logger_get_prune_list(struct logger_list *logger_list UNUSED,
+ char *buf, size_t len)
+{
+ strncpy(buf, unsupported, len);
+ return -ENOTSUP;
+}
+
+int android_logger_set_prune_list(struct logger_list *logger_list UNUSED,
+ char *buf, size_t len)
+{
+ static const char unsupported_error[] = "Unsupported";
+ strncpy(buf, unsupported, len);
+ return -ENOTSUP;
+}
+
+#endif /* USERDEBUG_BUILD */
+
struct logger_list *android_logger_list_alloc(int mode,
unsigned int tail,
pid_t pid)