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

PGM receiver crash fix #3226

Merged
merged 2 commits into from
Aug 19, 2018
Merged

PGM receiver crash fix #3226

merged 2 commits into from
Aug 19, 2018

Conversation

answeroo
Copy link
Contributor

Pull Request Notice

Before sending a pull request make sure each commit solves one clear, minimal,
plausible problem. Further each commit should have the following format:

Problem: X is broken

Solution: do Y and Z to fix X

Please try to have the code changes conform to our coding style. For your
convenience, you can install clang-format (at least version 5.0) and then
run make clang-format-check. Don't fix existing issues, if any - just
make sure your changes are compliant. make clang-format-diff will
automatically apply the required changes.
To set a specific clang-format binary with autotools, you can for example
run: ./configure CLANG_FORMAT=clang-format-5.0

Please avoid sending a pull request with recursive merge nodes, as they
are impossible to fix once merged. Please rebase your branch on
zeromq/libzmq master instead of merging it.

git remote add upstream git@github.com:zeromq/libzmq.git
git fetch upstream
git rebase upstream/master
git push -f

In case you already merged instead of rebasing you can drop the merge commit.

git rebase -i HEAD~10

Now, find your merge commit and mark it as drop and save. Finally rebase!

If you are a new contributor please have a look at our contributing guidelines:
CONTRIBUTING

@bluca
Copy link
Member

bluca commented Aug 17, 2018

Fix the indentation to follow the rules (4 spaces, no tabs) and squash the commits into one

@bluca
Copy link
Member

bluca commented Aug 19, 2018

I'll fix it

@bluca bluca merged commit 7852a6c into zeromq:master Aug 19, 2018
bluca added a commit that referenced this pull request Aug 19, 2018
@bluca
Copy link
Member

bluca commented Aug 19, 2018

@answeroo thanks for your PR. Since this is your first contribution, please send another PR with a relicensing grant. See README here for details: https://github.com/zeromq/libzmq/tree/master/RELICENSE and this example: https://github.com/zeromq/libzmq/blob/master/RELICENSE/WenbinHou.md

MohammadAlTurany pushed a commit to FairRootGroup/libzmq that referenced this pull request Jan 28, 2019
Problem: PGM receiver can crash due to race

Solution: do not run in_event until restart_input finishes correctly.

Signed-off-by: answeroo <jiming@yafco.com>
MohammadAlTurany pushed a commit to FairRootGroup/libzmq that referenced this pull request Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants