diff options
| author | Ken Sumrall <ksumrall@android.com> | 2013-04-15 17:33:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 17:33:27 +0000 |
| commit | 774814d1940a87175fc7dc692fef5c626d893968 (patch) | |
| tree | dd3629bc459c9485b1c27a4272cfda7853cfed76 | |
| parent | 24bc41b78ca004ac7a6873054ff919da1ba9a6f8 (diff) | |
| parent | 7425fd1b231fcdb3c260877a13f794a0c7361e80 (diff) | |
| download | system_core-774814d1940a87175fc7dc692fef5c626d893968.zip system_core-774814d1940a87175fc7dc692fef5c626d893968.tar.gz system_core-774814d1940a87175fc7dc692fef5c626d893968.tar.bz2 | |
Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev
| -rw-r--r-- | include/cutils/klog.h | 6 | ||||
| -rw-r--r-- | libcutils/klog.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/cutils/klog.h b/include/cutils/klog.h index 1335543..ba728ac 100644 --- a/include/cutils/klog.h +++ b/include/cutils/klog.h @@ -17,12 +17,18 @@ #ifndef _CUTILS_KLOG_H_ #define _CUTILS_KLOG_H_ +#include <sys/cdefs.h> + +__BEGIN_DECLS + void klog_init(void); void klog_set_level(int level); void klog_close(void); void klog_write(int level, const char *fmt, ...) __attribute__ ((format(printf, 2, 3))); +__END_DECLS + #define KLOG_ERROR(tag,x...) klog_write(3, "<3>" tag ": " x) #define KLOG_WARNING(tag,x...) klog_write(4, "<4>" tag ": " x) #define KLOG_NOTICE(tag,x...) klog_write(5, "<5>" tag ": " x) diff --git a/libcutils/klog.c b/libcutils/klog.c index b586a57..812af3b 100644 --- a/libcutils/klog.c +++ b/libcutils/klog.c @@ -35,6 +35,9 @@ void klog_set_level(int level) { void klog_init(void) { static const char *name = "/dev/__kmsg__"; + + if (klog_fd >= 0) return; /* Already initialized */ + if (mknod(name, S_IFCHR | 0600, (1 << 8) | 11) == 0) { klog_fd = open(name, O_WRONLY); fcntl(klog_fd, F_SETFD, FD_CLOEXEC); @@ -50,7 +53,7 @@ void klog_write(int level, const char *fmt, ...) va_list ap; if (level > klog_level) return; - if (klog_fd < 0) return; + if (klog_fd < 0) klog_init(); va_start(ap, fmt); vsnprintf(buf, LOG_BUF_MAX, fmt, ap); |