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

Fixing #2931 #3059

Merged
merged 2 commits into from Dec 9, 2017
Merged

Fixing #2931 #3059

merged 2 commits into from Dec 9, 2017

Conversation

sithhell
Copy link
Member

@sithhell sithhell commented Dec 8, 2017

runtime termination in the presence of --hpx:help or --hpx:version needs to
happen after the runtime has been initialized.

runtime termination in the presence of --hpx:help or --hpx:version needs to
happen after the runtime has been initialized.
@sithhell sithhell added this to the 1.1.0 milestone Dec 8, 2017
@sithhell
Copy link
Member Author

sithhell commented Dec 8, 2017

@kleinhenz could you verify if this fixes the issue for you?

@kleinhenz
Copy link
Contributor

Yes fixed for me. Thanks!

src/hpx_init.cpp Outdated
// (if the program options contain --hpx:help or --hpx:version)
if (rp.terminate_after_parse())
{
return result;
Copy link
Member

Choose a reason for hiding this comment

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

Why have you remove conditionally setting of the result value to zero?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because it's always zero at this point in time as far as I can see.

Copy link
Member

@hkaiser hkaiser Dec 9, 2017

Choose a reason for hiding this comment

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

You're right. The code as it is right now leaves result unchanged after it was initialized. This is a leftover problem from our move to the resource_partitioner, though. I'll try to come up with a patch against this PR to fix things.

@sithhell
Copy link
Member Author

sithhell commented Dec 9, 2017

Thanks Hartmut, looks good.

Copy link
Member

@hkaiser hkaiser left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@sithhell sithhell merged commit 8ec4122 into master Dec 9, 2017
@sithhell sithhell deleted the fix_2931 branch December 9, 2017 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants