Skip to content

amzn: avoid sprinkling ifdefs and use flags #2636

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

Merged
igaw merged 1 commit into from
Dec 20, 2024
Merged

amzn: avoid sprinkling ifdefs and use flags #2636

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
8 changes: 3 additions & 5 deletions plugins/amzn/amzn-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
#define AMZN_NVME_STATS_LOGPAGE_ID 0xD0
#define AMZN_NVME_STATS_MAGIC 0x3C23B510

#ifdef CONFIG_JSONC
#define array_add_obj json_array_add_value_object
#define obj_add_array json_object_add_value_array
#define obj_add_obj json_object_add_value_object
#define obj_add_uint json_object_add_value_uint
#define obj_add_uint64 json_object_add_value_uint64
#endif /* CONFIG_JSONC */

struct nvme_vu_id_ctrl_field {
__u8 bdev[32];
Expand Down Expand Up @@ -169,6 +167,8 @@ static void amzn_print_json_stats(struct amzn_latency_log_page *log)

json_free_object(root);
}
#else /* CONFIG_JSONC */
#define amzn_print_json_stats(log)
#endif /* CONFIG_JSONC */

static void amzn_print_normal_stats(struct amzn_latency_log_page *log)
Expand Down Expand Up @@ -266,11 +266,9 @@ static int get_stats(int argc, char **argv, struct command *cmd,
return err;
}

#ifdef CONFIG_JSONC
if (!strcmp(cfg.output_format, "json"))
if (flags & JSON)
amzn_print_json_stats(&log);
else
#endif /* CONFIG_JSONC */
amzn_print_normal_stats(&log);

return 0;
Expand Down
Loading