Skip to content

Fiber#raise: transfer into transferred fibers instead of resuming #9734

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

Open
sampokuokkanen wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −8
Open

Fiber#raise: transfer into transferred fibers instead of resuming #9734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,25 +371,42 @@ public IRubyObject raise(ThreadContext context, IRubyObject exception) {
}

final FiberData data = this.data;
if (data.prev != null) throw runtime.newFiberError("double resume");

// MRI: fiber_raise, which forwards to the fiber we are resuming
ThreadFiber resuming = data.resumingFiber;
if (resuming != null) return resuming.raise(context, exception);

// MRI: a fiber suspended by transfer (not in Fiber.yield) is raised into by transferring to it
boolean transfer = !data.yielding;

if (!transfer && data.prev != null) throw runtime.newFiberError("double resume");

if (data.parent != context.getFiberCurrentThread()) fiberCalledAcrossThreads(runtime);

RubyException rubyException = (RubyException) exception;
rubyException.prepareBacktrace(context);
FiberRequest val = new FiberRequest(rubyException.toThrowable(), RequestType.RAISE);

// like resume, this hands control over, so track both ends
ThreadFiber currentFiber = context.getFiber();
data.prev = currentFiber;
currentFiber.data.resumingFiber = this;
if (transfer) {
currentFiberData.transferred = true;
data.transferredTo = true;
} else {
// like resume, this hands control over, so track both ends
data.prev = currentFiber;
currentFiberData.resumingFiber = this;
}

FiberRequest result = null;
try {
result = exchangeWithFiber(context, currentFiberData, data, val);
} finally {
data.prev = null;
currentFiber.data.resumingFiber = null;
if (transfer) {
currentFiberData.transferred = false;
} else {
data.prev = null;
currentFiberData.resumingFiber = null;
}
}

if (result.type == RequestType.RAISE) {
Expand Down
18 changes: 18 additions & 0 deletions spec/ruby/core/fiber/raise_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,22 @@
fiber.transfer
-> { fiber.raise "msg" }.should.raise(RuntimeError, "msg")
end

it "lets a transferring fiber that rescues the exception transfer back" do
root = Fiber.current
fiber = Fiber.new do
2.times do
begin
root.transfer
rescue RuntimeError => e
e.message.should == "msg"
end
end
:done
end
fiber.transfer
fiber.raise("msg").should == nil
fiber.raise("msg").should == :done
fiber.should_not.alive?
end
end
2 changes: 0 additions & 2 deletions spec/tags/ruby/core/fiber/raise_tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
fails:Fiber#raise should raise on parent fiber
fails:Fiber#raise re-raises a previously rescued exception with cleaned backtrace and sets a new backtrace
fails:Fiber#raise raises in a Fiber which is resuming the current Fiber, without resuming the current Fiber again
Loading