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

fix paste freeze (#1366) #1383

Merged
merged 5 commits into from
May 16, 2022
Merged

fix paste freeze (#1366) #1383

merged 5 commits into from
May 16, 2022

Conversation

tlinford
Copy link
Contributor

@tlinford tlinford commented May 6, 2022

Resolve #1366 by offloading writes to a separate thread.

@tlinford tlinford temporarily deployed to cachix May 6, 2022 08:08 Inactive
@tlinford tlinford temporarily deployed to cachix May 6, 2022 08:08 Inactive
@tlinford tlinford requested a review from imsnif May 6, 2022 08:57
@raphCode
Copy link
Contributor

Can confirm that the deadlock is not happening with this PR, good work!

@tlinford tlinford temporarily deployed to cachix May 10, 2022 19:03 Inactive
@tlinford tlinford temporarily deployed to cachix May 10, 2022 19:03 Inactive
Copy link
Member

@imsnif imsnif left a comment

Choose a reason for hiding this comment

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

Hey @tlinford - thanks for the great troubleshooting on this!

I left some comments, mostly stylistic but I'm also unsure why we increased the channel bound by so much. I haven't tested this yet because I wanted to sort through that issue first. Once we do, I'll give this a thorough hammering and we'll make sure it's all good.

zellij-server/src/lib.rs Outdated Show resolved Hide resolved
zellij-server/src/tab/mod.rs Outdated Show resolved Hide resolved
zellij-server/src/tab/mod.rs Outdated Show resolved Hide resolved
zellij-server/src/tab/mod.rs Outdated Show resolved Hide resolved
@tlinford tlinford temporarily deployed to cachix May 14, 2022 16:40 Inactive
@tlinford tlinford temporarily deployed to cachix May 14, 2022 16:40 Inactive
@tlinford
Copy link
Contributor Author

@imsnif cleaned it up, should be good for testing.

@tlinford tlinford temporarily deployed to cachix May 15, 2022 15:20 Inactive
@tlinford tlinford temporarily deployed to cachix May 15, 2022 15:20 Inactive
@tlinford tlinford marked this pull request as ready for review May 16, 2022 07:51
@imsnif
Copy link
Member

imsnif commented May 16, 2022

Hey @tlinford - tested this a little and to me it seems OK. Maybe @raphCode wants to give this another go to make sure the channel bound increase wasn't what inadvertently fixed it?

Otherwise, merge at your leisure :)

@raphCode
Copy link
Contributor

Seems to work for me!

@tlinford tlinford merged commit e8f9559 into main May 16, 2022
@tlinford tlinford deleted the fix-paste-hang branch May 16, 2022 19:15
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.

Pasting certain text from clipboard into vim makes zellij freeze
3 participants