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

Network Mux Close #3121

Merged
merged 9 commits into from
May 12, 2021
Merged

Network Mux Close #3121

merged 9 commits into from
May 12, 2021

Conversation

coot
Copy link
Contributor

@coot coot commented May 7, 2021

No description provided.

@coot coot requested a review from karknu as a code owner May 7, 2021 14:39
@coot coot added mux issues related to network-mux networking labels May 7, 2021
@coot coot requested review from dcoutts and njd42 May 7, 2021 14:39
njd42
njd42 approved these changes May 10, 2021
View reviewed changes
Copy link
Contributor

@njd42 njd42 left a comment

Choose a reason for hiding this comment

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

This is all looking good. The logic of the "group" didn't jump out at me, but thats fine.

karknu
karknu approved these changes May 10, 2021
View reviewed changes
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.

network-mux/src/Network/Mux.hs Show resolved Hide resolved
network-mux/src/Network/Mux/Bearer/AttenuatedChannel.hs Show resolved Hide resolved
@coot coot force-pushed the coot/network-mux-close branch 4 times, most recently from b4bcad3 to abb2be1 Compare May 10, 2021 16:17
coot added 7 commits May 10, 2021 18:47
@coot
JobPool: group jobs
d3621d0 
It is useful to tag each job, so we can get statistics on each group or
cancel threads that belong to each group seprately.
@coot
network-mux: introduce MonitorCtx
20c37d1 
This prepares for additional context terms needed by the monitor loop.
@coot
netowrk-mux: egress side of close procedure
2435c11
@coot
network-mux: ingress sidie of close procedure
2a385b1
@coot
network-mux: newtype wrapper for SDUSize
15dc048
@coot
network-mux: AttenuatedChannel
f36dbc3
@coot
network-mux: removed MuxCleanShutdown
ea9ed11 
It is not a clean shutdown if mux stops while any mini-protocol is still
runing.
@coot coot force-pushed the coot/network-mux-close branch 6 times, most recently from da752de to 4452bdf Compare May 11, 2021 07:11
coot added 2 commits May 11, 2021 09:26
@coot
network-mux: test mux shutdown
d07b393
@coot
ouroboros-network-framework: fixed mux test
a4a4c59 
The `socket error during receive` test was failing, because it closed
the socket before mux started.  Add a lock which makes sure that mux
is running when we close the socket.
@coot
Copy link
Contributor Author

coot commented May 12, 2021

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 12, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit 4c9aaf1 into master May 12, 2021
@iohk-bors iohk-bors bot deleted the coot/network-mux-close branch May 12, 2021 10:06
coot added a commit that referenced this pull request May 16, 2022
@iohk-bors @coot
Merge #3121
a66e989 
3121: Network Mux Close r=coot a=coot



Co-authored-by: Marcin Szamotulski <profunctor@pm.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karknu karknu karknu approved these changes

@njd42 njd42 njd42 approved these changes

@dcoutts dcoutts Awaiting requested review from dcoutts

Assignees
No one assigned
Labels
mux issues related to network-mux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@coot @karknu @njd42