Skip to content

logging: suppress logging except during normal output #3023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NateThornton wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −8
Open

logging: suppress logging except during normal output #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ struct submit_data {
int log_level;
static struct submit_data sb;

bool is_printable_at_level(int level)
{
return ((log_level >= level) &&
(strcmp(nvme_cfg.output_format, "normal") == 0));
}

int map_log_level(int verbose, bool quiet)
{
int log_level;
Expand Down
17 changes: 9 additions & 8 deletions logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

#include <stdbool.h>

#define print_info(...) \
do { \
if (log_level >= LOG_INFO) \
printf(__VA_ARGS__); \
#define print_info(...) \
do { \
if (is_printable_at_level(LOG_INFO)) \
printf(__VA_ARGS__); \
} while (false)

#define print_debug(...) \
do { \
if (log_level >= LOG_DEBUG) \
printf(__VA_ARGS__); \
#define print_debug(...) \
do { \
if (is_printable_at_level(LOG_DEBUG)) \
printf(__VA_ARGS__); \
} while (false)

extern int log_level;
Expand All @@ -29,6 +29,7 @@ void nvme_submit_exit(struct nvme_transport_handle *hdl,
bool nvme_decide_retry(struct nvme_transport_handle *hdl,
struct nvme_passthru_cmd *cmd, int err);

bool is_printable_at_level(int level);
int map_log_level(int verbose, bool quiet);

#endif // DEBUG_H_