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

Improve mux tracing #2794

Merged
merged 3 commits into from Dec 11, 2020
Merged

Improve mux tracing #2794

merged 3 commits into from Dec 11, 2020

Conversation

coot
Copy link
Contributor

@coot coot commented Dec 7, 2020

This PR consist of three patches, the last one is not at all about tracing:

  • network-mux: replaced 'Dying' with MuxTraceTerminating
    Mux is not dying anymore when a mini-protocol terminates, let's reflect that
    in the trace.
  • network-mux: sligtly nicer Show instance for MuxTrace
  • network-mux: filling completionVar should never block
    Might be controverial! It is sensible to throw an exception if it blocks.

Mux is not dying when a mini-protocol terminates.  Let's reflect that in
the trace.
Sometimes the parameters blend together, it's nicer to put some brackets
around them.
@coot coot added mux issues related to network-mux networking labels Dec 7, 2020
@coot coot requested review from dcoutts and karknu December 7, 2020 17:01
Error if `putTMVar completionVar` blocks.  If there ever will be
a mistake, it will be clearer than a deadlock.
Copy link
Contributor

@karknu karknu left a comment

Choose a reason for hiding this comment

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

LGTM

@coot
Copy link
Contributor Author

coot commented Dec 8, 2020

bors merge

iohk-bors bot added a commit that referenced this pull request Dec 8, 2020
2794: Improve mux tracing r=coot a=coot

This PR consist of three patches, the last one is not at all about tracing:

- network-mux: replaced 'Dying' with MuxTraceTerminating
  Mux is not dying anymore when a mini-protocol terminates, let's reflect that
  in the trace.
- network-mux: sligtly nicer Show instance for MuxTrace
- network-mux: filling completionVar should never block
  ~Might be **controverial**!~ It is sensible to throw an exception if it blocks.


Co-authored-by: Marcin Szamotulski <profunctor@pm.me>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 8, 2020

Build failed:

@coot
Copy link
Contributor Author

coot commented Dec 8, 2020

bors merge

iohk-bors bot added a commit that referenced this pull request Dec 8, 2020
2794: Improve mux tracing r=coot a=coot

This PR consist of three patches, the last one is not at all about tracing:

- network-mux: replaced 'Dying' with MuxTraceTerminating
  Mux is not dying anymore when a mini-protocol terminates, let's reflect that
  in the trace.
- network-mux: sligtly nicer Show instance for MuxTrace
- network-mux: filling completionVar should never block
  ~Might be **controverial**!~ It is sensible to throw an exception if it blocks.


Co-authored-by: Marcin Szamotulski <profunctor@pm.me>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 8, 2020

Build failed:

@coot
Copy link
Contributor Author

coot commented Dec 11, 2020

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 11, 2020

@iohk-bors iohk-bors bot merged commit 6ca4a52 into master Dec 11, 2020
@iohk-bors iohk-bors bot deleted the coot/network-mux-tracing branch December 11, 2020 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mux issues related to network-mux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants