diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-06 06:40:17 +0200 | 
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-04-01 06:53:26 +0200 | 
| commit | 0bdeb5e58d8fdf8b0f30461a388768112b0e080c (patch) | |
| tree | 8a5889d3b10b0b89a6fbf403f3bc7a3a040fce3e /watchfrr/watchfrr.c | |
| parent | 6f00dd6658acd0dc04f6c65e28452c2de93c99d5 (diff) | |
lib: rewrite zlog lock-free & TLS-buffered
This is a full rewrite of the "back end" logging code.  It now uses a
lock-free list to iterate over logging targets, and the targets
themselves are as lock-free as possible.  (syslog() may have a hidden
internal mutex in the C library;  the file/fd targets use a single
write() call which should ensure atomicity kernel-side.)
Note that some functionality is lost in this patch:
- Solaris printstack() backtraces are ditched (unlikely to come back)
- the `log-filter` machinery is gone (re-added in followup commit)
- `terminal monitor` is temporarily stubbed out.  The old code had a
  race condition with VTYs going away.  It'll likely come back rewritten
  and with vtysh support.
- The `zebra_ext_log` hook is gone.  Instead, it's now much easier to
  add a "proper" logging target.
v2: TLS buffer to get some actual performance
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'watchfrr/watchfrr.c')
| -rw-r--r-- | watchfrr/watchfrr.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 05e6651229..d6d8f77243 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -27,6 +27,7 @@  #include "command.h"  #include "libfrr.h"  #include "lib_errors.h" +#include "zlog_targets.h"  #include <getopt.h>  #include <sys/un.h> @@ -1369,11 +1370,10 @@ int main(int argc, char **argv)  	frr_config_fork(); -	zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);  	if (watchfrr_di.daemon_mode) -		zlog_set_level(ZLOG_DEST_SYSLOG, MIN(gs.loglevel, LOG_DEBUG)); +		zlog_syslog_set_prio_min(MIN(gs.loglevel, LOG_DEBUG));  	else -		zlog_set_level(ZLOG_DEST_STDOUT, MIN(gs.loglevel, LOG_DEBUG)); +		zlog_aux_init(NULL, MIN(gs.loglevel, LOG_DEBUG));  	frr_run(master);  | 
