Add the ability to prepend encoded log severity in the log message #1327
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bryanseay
reviewed
Mar 19, 2019
userspace/libsinsp/logger.cpp
Outdated
|
|
||
| namespace { | ||
| // All severity strings should be ENCODE_LEN chars long | ||
| const char* sev_levels[] = { |
There was a problem hiding this comment.
all caps preferred...
SEVERITY_LEVELS
userspace/libsinsp/logger.h
Outdated
| @@ -95,10 +98,16 @@ class SINSP_PUBLIC sinsp_logger | |||
| char* format(severity sev, const char* fmt, ...); | |||
| char* format(const char* fmt, ...); | |||
|
|
|||
| // Returns the decoded severity or SEV_MAX+1 for errors. | |||
| // len is set to the length of the severity string on success | |||
| // and 0 in case of errors | |||
There was a problem hiding this comment.
Change to doxy style...
/**
* This is my stuff
*/
There was a problem hiding this comment.
I don't see this returning SEV_MAX+1 anywhere
userspace/libsinsp/logger.cpp
Outdated
| for(size_t i = 1; i <= SEV_MAX; ++i) | ||
| { | ||
| uint64_t level = *((uint64_t*) sev_levels[i]); | ||
| if(msg_level == level) |
There was a problem hiding this comment.
this is fine, but not convinced it buys us much vs just a string compare
There was a problem hiding this comment.
Even with a hardcoded length of 8, the strncmp isn't optimized out, while the pointer cast (which I changed to a memcpy in the meantime to avoid alignment issues) gets compiled down to cmp reg, [reg]:
Either way, this is nowhere near the hot path (hopefully) so we'll be fine with the strncmp. Thoughts?
There was a problem hiding this comment.
Settled on using strncmp.
gnosek
force-pushed
the
nfs-with-logger-fix
branch
from
1d77a0b to
5e2b1d3
Compare
gnosek
force-pushed
the
nfs-with-logger-fix
branch
2 times, most recently
from
f873b5e to
7b20b69
Compare
gnosek
force-pushed
the
nfs-with-logger-fix
branch
from
7b20b69 to
d3e6abd
Compare
gnosek
force-pushed
the
nfs-with-logger-fix
branch
from
d3e6abd to
f5f9d16
Compare
gnosek
force-pushed
the
nfs-with-logger-fix
branch
from
f5f9d16 to
ab05eaf
Compare
bryanseay
approved these changes
Apr 29, 2019
gnosek
force-pushed
the
nfs-with-logger-fix
branch
from
ab05eaf to
ce04f3a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically #1266 with some changes, on top of the
nfsbranch, so please review only the last commit (the rest is in separate PRs already and should be merged before this)