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.

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

Don't exit in cleanup_and_fail #1202

Merged
merged 1 commit into from Sep 21, 2021
Merged

Don't exit in cleanup_and_fail #1202

merged 1 commit into from Sep 21, 2021

Conversation

ludeeus
Copy link
Contributor

@ludeeus ludeeus commented Sep 13, 2021

PLEASE NOTE the following text from the iperf3 license. Submitting a
pull request to the iperf3 repository constitutes "[making]
Enhancements available...publicly":

You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to Lawrence Berkeley National
Laboratory, without imposing a separate written license agreement for such
Enhancements, then you hereby grant the following license: a non-exclusive,
royalty-free perpetual license to install, use, modify, prepare derivative
works, incorporate into other computer software, distribute, and sublicense
such enhancements or derivative works thereof, in binary and source code form.

The complete iperf3 license is available in the LICENSE file in the
top directory of the iperf3 source tree.

  • Version of iperf3 (or development branch, such as master or
    3.1-STABLE) to which this pull request applies: 3.10 +

  • Issues fixed (if any):

  • Brief description of code changes (suitable for use as a commit message):

#1146 which aimed to add the error message inside the JSON output did so by invoking iperf_errexit.
While this works it also has the side effect of terminating the parent process when the test run is invoked from python like with https://github.com/thiezn/iperf3-python

This PR provides the desired output that was requested in #1143 without exiting during cleanup.

@matt9j
Copy link
Contributor

matt9j commented Sep 18, 2021

I independently ran into this issue, and was preparing a very similar PR when I encountered #1205 and the link to this commit. Fixing this is essential for any external usage of libiperf. Let me know if there is anything I can do to help test or validate changes!

@swlars swlars merged commit c31ca00 into esnet:master Sep 21, 2021
@ludeeus ludeeus deleted the patch-1 branch September 21, 2021 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants