sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

debug: Optimise construction of header_str_no_nl

Browse Source 
If it isn't used then it isn't copied.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Martin Schwenke 2021-09-23 18:13:30 +10:00 committed by Volker Lendecke
parent 8cdd20c70a
commit ee17f5306c
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/util/debug.c
View File

@ -225,6 +225,27 @@ static void copy_no_nl(char *out,
memcpy(out, in, len); memcpy(out, in, len);
out[len] = '\0'; out[len] = '\0';
} }
#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD) || \
defined(HAVE_LTTNG_TRACEF) || defined(HAVE_GPFS)
static void ensure_copy_no_nl(char *out,
size_t out_size,
const char *in,
size_t in_len)
{
/*
* Assume out is a static buffer that is reused as a cache.
* If it isn't empty then this has already been done with the
* same input.
*/
if (out[0] != '\0') {
return;
}
copy_no_nl(out, out_size, in, in_len);
}
#endif
/* -------------------------------------------------------------------------- ** /* -------------------------------------------------------------------------- **
* Debug backends. When logging to DEBUG_FILE, send the log entries to * Debug backends. When logging to DEBUG_FILE, send the log entries to
* all active backends. * all active backends.
@ -314,6 +335,10 @@ static void debug_systemd_log(int msg_level,
const char *msg_no_nl) const char *msg_no_nl)
{ {
if (state.hs_len > 0) { if (state.hs_len > 0) {
ensure_copy_no_nl(state.header_str_no_nl,
sizeof(state.header_str_no_nl),
state.header_str,
state.hs_len);
sd_journal_send("MESSAGE=%s", sd_journal_send("MESSAGE=%s",
state.header_str_no_nl, state.header_str_no_nl,
"PRIORITY=%d", "PRIORITY=%d",
@ -337,6 +362,10 @@ static void debug_lttng_log(int msg_level,
const char *msg_no_nl) const char *msg_no_nl)
{ {
if (state.hs_len > 0) { if (state.hs_len > 0) {
ensure_copy_no_nl(state.header_str_no_nl,
sizeof(state.header_str_no_nl),
state.header_str,
state.hs_len);
tracef(state.header_str_no_nl); tracef(state.header_str_no_nl);
} }
tracef(msg_no_nl); tracef(msg_no_nl);
@ -374,6 +403,10 @@ static void debug_gpfs_log(int msg_level,
const char *msg_no_nl) const char *msg_no_nl)
{ {
if (state.hs_len > 0) { if (state.hs_len > 0) {
ensure_copy_no_nl(state.header_str_no_nl,
sizeof(state.header_str_no_nl),
state.header_str,
state.hs_len);
gpfswrap_add_trace(msg_level, state.header_str_no_nl); gpfswrap_add_trace(msg_level, state.header_str_no_nl);
} }
gpfswrap_add_trace(msg_level, msg_no_nl); gpfswrap_add_trace(msg_level, msg_no_nl);
@ -1738,10 +1771,7 @@ full:
state.hs_len = sizeof(state.header_str) - 1; state.hs_len = sizeof(state.header_str) - 1;
} }
copy_no_nl(state.header_str_no_nl, state.header_str_no_nl[0] = '\0';
sizeof(state.header_str_no_nl),
state.header_str,
state.hs_len);
errno = old_errno; errno = old_errno;
return( true ); return( true );