summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-22 03:51:26 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-22 03:51:26 +0200
commit185986c61d4f84efcc02cc5766c77e876654a0a9 (patch)
tree8fa3cb00b30591f23850787a0ac501ebb340b7d2 /log.c
parent4f0f902fc8837999e5c9f3a6f7e2592cc6f096eb (diff)
assert: store away assert msg before aborting, akin to glibc's __abort_msg
Diffstat (limited to 'log.c')
-rw-r--r--log.c65
1 files changed, 47 insertions, 18 deletions
diff --git a/log.c b/log.c
index d8cc4048c4..076fa00bfd 100644
--- a/log.c
+++ b/log.c
@@ -40,6 +40,10 @@ static int log_max_level = LOG_DEBUG;
static int syslog_fd = -1;
static int kmsg_fd = -1;
+/* Akin to glibc's __abort_msg; which is private and we hance cannot
+ * use here. */
+static char *log_abort_msg = NULL;
+
void log_close_kmsg(void) {
if (kmsg_fd >= 0) {
@@ -245,6 +249,26 @@ static int write_to_kmsg(
return 0;
}
+#define LOG_DISPATCH(level,file,line,func,format) \
+ do { \
+ va_list _ap; \
+ bool written = false; \
+ if (log_target == LOG_TARGET_KMSG) { \
+ va_start(_ap, format); \
+ written = write_to_kmsg(level, file, line, func, format, _ap) >= 0; \
+ va_end(_ap); \
+ } else if (log_target == LOG_TARGET_SYSLOG) { \
+ va_start(_ap, format); \
+ written = write_to_syslog(level, file, line, func, format, _ap) >= 0; \
+ va_end(_ap); \
+ } \
+ if (!written) { \
+ va_start(_ap, format); \
+ write_to_console(level, file, line, func, format, _ap); \
+ va_end(_ap); \
+ } \
+ } while (false)
+
void log_meta(
int level,
const char*file,
@@ -252,32 +276,37 @@ void log_meta(
const char *func,
const char *format, ...) {
- va_list ap;
- bool written;
int saved_errno;
if (LOG_PRI(level) > log_max_level)
return;
saved_errno = errno;
- written = false;
-
- if (log_target == LOG_TARGET_KMSG) {
- va_start(ap, format);
- written = write_to_kmsg(level, file, line, func, format, ap) >= 0;
- va_end(ap);
- } else if (log_target == LOG_TARGET_SYSLOG) {
- va_start(ap, format);
- written = write_to_syslog(level, file, line, func, format, ap) >= 0;
- va_end(ap);
- }
+ LOG_DISPATCH(level, file, line, func, format);
+ errno = saved_errno;
+}
- if (!written) {
- va_start(ap, format);
- write_to_console(level, file, line, func, format, ap);
- va_end(ap);
- }
+void log_assert(
+ const char*file,
+ int line,
+ const char *func,
+ const char *format, ...) {
+
+ static char buffer[LOG_BUFFER_MAX];
+ va_list ap;
+ int saved_errno = errno;
+
+ va_start(ap, format);
+ vsnprintf(buffer, sizeof(buffer), format, ap);
+ va_end(ap);
+
+ char_array_0(buffer);
+ log_abort_msg = buffer;
+
+ LOG_DISPATCH(LOG_CRIT, file, line, func, format);
+ abort();
+ /* If the user chose to ignore this SIGABRT, we are happy to go on, as if nothing happened. */
errno = saved_errno;
}