Skip to content
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

Jump to bottom

Merge -lv output into stdout #3383

Merged
merged 1 commit into from
Aug 7, 2024
Merged

Merge -lv output into stdout #3383

merged 1 commit into from
Aug 7, 2024

Conversation

ZhangYet
Copy link
Contributor

@ZhangYet ZhangYet commented Aug 6, 2024

To fix #3379

Checklist
  • [*] Language changes are updated in man/adoc/bpftrace.adoc
  • [*] User-visible and non-trivial changes updated in CHANGELOG.md
  • [*] The new behaviour is covered by tests

@ZhangYet ZhangYet mentioned this pull request Aug 6, 2024
Closed
danobi
danobi approved these changes Aug 6, 2024
View reviewed changes
Copy link
Member

@danobi danobi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! makes sense to me

danobi
danobi reviewed Aug 6, 2024
View reviewed changes
Copy link
Member

@danobi danobi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also while you're at it, do you mind updating commit message with the justification inline? it makes it easier to git-blame down the line without opening up github

src/probe_matcher.cpp Outdated
@@ -480,7 +480,7 @@ void ProbeMatcher::list_probes(ast::Program* prog)
std::cout << probe_type << ":" << match_print << std::endl;
if (bt_verbose) {
for (auto& param : param_lists[match])
LOG(V1) << " " << param;
std::cout << " " << param;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, missing a newline here. Nice tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I mean std::endl for the output

@ZhangYet
Copy link
Contributor Author

ZhangYet commented Aug 7, 2024

also while you're at it, do you mind updating commit message with the justification inline? it makes it easier to git-blame down the line without opening up github

Do you mean that I change the commit message to

Merge `-lv` output into `stdout` to fix issue 3379

viktormalik
viktormalik approved these changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@viktormalik viktormalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

+1 on the better commit message but we can always adjust it when squashing the PR.

@ZhangYet
Copy link
Contributor Author

ZhangYet commented Aug 7, 2024

@viktormalik @danobi Hi, I have fixed the commit message.

@danobi danobi merged commit 75e830c into bpftrace:master Aug 7, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danobi danobi danobi approved these changes

@viktormalik viktormalik viktormalik approved these changes

@ajor ajor Awaiting requested review from ajor ajor is a code owner

@fbs fbs Awaiting requested review from fbs fbs is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Split output on -lv, to stdout and stderr
3 participants
@ZhangYet @danobi @viktormalik