Skip to content

libbpftune: fix va_args handling in scenario logging #113

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
alan-maguire merged 1 commit into from
Nov 27, 2024
Merged

libbpftune: fix va_args handling in scenario logging #113

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
libbpftune: fix va_args handling in scenario logging 
Causes issues on aarch64; rework to pass va_args *

Signed-off-by: Alan Maguire <[email protected]>
  • Loading branch information
@alan-maguire
alan-maguire committed Nov 27, 2024
commit 1a05b6f7481a1573de90aa744a7d55afe3ef13a0
9 changes: 5 additions & 4 deletions src/libbpftune.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,13 +744,13 @@ struct bpftuner *bpftuner_init(const char *path)
static void __bpftuner_scenario_log(struct bpftuner *tuner, unsigned int tunable,
unsigned int scenario, int netns_fd,
bool summary,
const char *fmt, va_list args);
const char *fmt, va_list *args);

#define bpftuner_scenario_log_fmt(tuner, tunable, scenario, netns_fd, summary, fmt)\
{ \
va_list __args; \
if (fmt) va_start(__args, fmt); \
__bpftuner_scenario_log(tuner, tunable, scenario, netns_fd, summary, fmt, __args);\
__bpftuner_scenario_log(tuner, tunable, scenario, netns_fd, summary, fmt, &__args);\
if (fmt) va_end(__args); \
}

Expand Down Expand Up @@ -1181,7 +1181,7 @@ void bpftuner_tunable_stats_update(struct bpftuner *tuner,
static void __bpftuner_scenario_log(struct bpftuner *tuner, unsigned int tunable,
unsigned int scenario, int netns_fd,
bool summary,
const char *fmt, va_list args)
const char *fmt, va_list *args)
{
struct bpftunable *t = bpftuner_tunable(tuner, tunable);
bool global_ns = netns_fd == 0;
Expand Down Expand Up @@ -1233,7 +1233,8 @@ static void __bpftuner_scenario_log(struct bpftuner *tuner, unsigned int tunable
t->desc.name,
global_ns ? "" : "non-",
tuner->scenarios[scenario].description);
__bpftune_log(BPFTUNE_LOG_LEVEL, fmt, args);
if (args)
__bpftune_log(BPFTUNE_LOG_LEVEL, fmt, *args);
__bpftuner_tunable_stats_update(t, scenario, global_ns, 1);
}
}
Expand Down