Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / zlog.c

diff --git a/lib/zlog.c b/lib/zlog.c
index e0bb34a258547ccbe1a9ba0e08e04ece0c0937dc..309a955fa90a52ad27d4236ab2ee746f3b923eb8 100644 (file)
--- a/lib/zlog.c
+++ b/lib/zlog.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2015-19  David Lamparter, for NetDEF, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "zebra.h"
@@ -59,7 +48,7 @@
 #include "frrcu.h"
 #include "zlog.h"
 #include "libfrr_trace.h"
-#include "thread.h"
+#include "frrevent.h"
 
 DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE,  "log message");
 DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF,   "log thread-local buffer");
@@ -517,7 +506,7 @@ static void vzlog_tls(struct zlog_tls *zlog_tls, const struct xref_logmsg *xref,
 
 static void zlog_backtrace_msg(const struct xref_logmsg *xref, int prio)
 {
-       struct thread *tc = pthread_getspecific(thread_current);
+       struct event *tc = pthread_getspecific(thread_current);
        const char *uid = xref->xref.xrefdata->uid;
        bool found_thread = false;
 
@@ -743,7 +732,11 @@ const char *zlog_msg_text(struct zlog_msg *msg, size_t *textlen)
                fb.outpos_i = 0;
 
                va_copy(args, msg->args);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+               /* format-string checking is done further up the chain */
                need += vbprintfrr(&fb, msg->fmt, args);
+#pragma GCC diagnostic pop
                va_end(args);
 
                msg->textlen = need;
@@ -762,7 +755,11 @@ const char *zlog_msg_text(struct zlog_msg *msg, size_t *textlen)
                        fb.outpos_i = 0;
 
                        va_copy(args, msg->args);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+                       /* same as above */
                        vbprintfrr(&fb, msg->fmt, args);
+#pragma GCC diagnostic pop
                        va_end(args);
 
                        bputch(&fb, '\n');
@@ -991,16 +988,14 @@ void zlog_init(const char *progname, const char *protoname,
        zlog_instance = instance;
 
        if (instance) {
-               snprintfrr(zlog_tmpdir, sizeof(zlog_tmpdir),
-                          "/var/tmp/frr/%s-%d.%ld",
-                          progname, instance, (long)getpid());
+               snprintfrr(zlog_tmpdir, sizeof(zlog_tmpdir), "%s/%s-%d.%ld",
+                          TMPBASEDIR, progname, instance, (long)getpid());
 
                zlog_prefixsz = snprintfrr(zlog_prefix, sizeof(zlog_prefix),
                                           "%s[%d]: ", protoname, instance);
        } else {
-               snprintfrr(zlog_tmpdir, sizeof(zlog_tmpdir),
-                          "/var/tmp/frr/%s.%ld",
-                          progname, (long)getpid());
+               snprintfrr(zlog_tmpdir, sizeof(zlog_tmpdir), "%s/%s.%ld",
+                          TMPBASEDIR, progname, (long)getpid());
 
                zlog_prefixsz = snprintfrr(zlog_prefix, sizeof(zlog_prefix),
                                           "%s: ", protoname);