Skip to content

Commit 6d46910

Browse files
committed
Add required offset parameter.
1 parent 33aeaea commit 6d46910

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

test/io/event/selector.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ def transfer
478478

479479
fiber = Fiber.new do
480480
events << :io_read
481-
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize)
481+
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize, 0)
482482
expect(buffer.get_string(0, offset)).to be == message
483483
end
484484

@@ -499,7 +499,7 @@ def transfer
499499

500500
fiber = Fiber.new do
501501
events << :io_read
502-
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize)
502+
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize, 0)
503503
expect(buffer.get_string(0, offset)).to be == message
504504
end
505505

@@ -521,7 +521,7 @@ def transfer
521521
return unless selector.respond_to?(:io_read)
522522

523523
fiber = Fiber.new do
524-
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize)
524+
offset = selector.io_read(Fiber.current, local, buffer, message.bytesize, 0)
525525
expect(buffer.get_string(0, offset)).to be == message
526526
sleep(0.001)
527527
end
@@ -559,7 +559,7 @@ def transfer
559559
fiber = Fiber.new do
560560
events << :io_write
561561
buffer = IO::Buffer.for(message.dup)
562-
result = selector.io_write(Fiber.current, local, buffer, buffer.size)
562+
result = selector.io_write(Fiber.current, local, buffer, buffer.size, 0)
563563
expect(result).to be == message.bytesize
564564
local.close
565565
end

test/io/event/selector/buffered_io.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
writer = Fiber.new do
2323
buffer = IO::Buffer.new(128)
24-
expect(selector.io_write(Fiber.current, output, buffer, 128)).to be == 128
24+
expect(selector.io_write(Fiber.current, output, buffer, 128, 0)).to be == 128
2525
end
2626

2727
reader = Fiber.new do
2828
buffer = IO::Buffer.new(64)
29-
expect(selector.io_read(Fiber.current, input, buffer, 1)).to be == 64
29+
expect(selector.io_read(Fiber.current, input, buffer, 1, 0)).to be == 64
3030
end
3131

3232
reader.transfer
@@ -39,7 +39,7 @@
3939
skip_if_ruby_platform(/mswin|mingw|cygwin/)
4040

4141
buffer = IO::Buffer.new(1).slice(0, 0)
42-
expect(selector.io_write(Fiber.current, output, buffer, 0)).to be == 0
42+
expect(selector.io_write(Fiber.current, output, buffer, 0, 0)).to be == 0
4343
end
4444

4545
it "can read and write at the specified offset" do
@@ -70,7 +70,7 @@
7070

7171
writer = Fiber.new do
7272
buffer = IO::Buffer.new(64)
73-
result = selector.io_write(Fiber.current, input, buffer, 64)
73+
result = selector.io_write(Fiber.current, input, buffer, 64, 0)
7474
expect(result).to be < 0
7575
end
7676

@@ -88,7 +88,7 @@
8888
output.close
8989

9090
reader = Fiber.new do
91-
result = selector.io_read(Fiber.current, input, buffer, 0)
91+
result = selector.io_read(Fiber.current, input, buffer, 0, 0)
9292
end
9393

9494
reader.transfer
@@ -109,7 +109,7 @@ def be_again?
109109
result = nil
110110

111111
reader = Fiber.new do
112-
result = selector.io_read(Fiber.current, input, buffer, 0)
112+
result = selector.io_read(Fiber.current, input, buffer, 0, 0)
113113
end
114114

115115
reader.transfer

test/io/event/selector/cancellable.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
buffer = IO::Buffer.new(64)
2626

2727
10.times do
28-
expect{selector.io_read(Fiber.current, input, buffer, 1)}.to raise_exception(Interrupt)
28+
expect{selector.io_read(Fiber.current, input, buffer, 1, 0)}.to raise_exception(Interrupt)
2929
end
3030
end
3131

@@ -44,7 +44,7 @@
4444

4545
10.times do
4646
expect{selector.io_wait(Fiber.current, input, IO::READABLE)}.to raise_exception(Interrupt)
47-
selector.io_read(Fiber.current, input, buffer, 1)
47+
selector.io_read(Fiber.current, input, buffer, 1, 0)
4848
end
4949
end
5050

test/io/event/selector/file_io.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
writer = Fiber.new do
2121
buffer = IO::Buffer.new(128)
2222
file.seek(0)
23-
write_result = selector.io_write(Fiber.current, file, buffer, 128)
23+
write_result = selector.io_write(Fiber.current, file, buffer, 128, 0)
2424
end
2525

2626
reader = Fiber.new do
2727
buffer = IO::Buffer.new(64)
2828
file.seek(0)
2929

3030
# The read will return 0 if the data is not written yet:
31-
read_result = selector.io_read(Fiber.current, file, buffer, 0)
31+
read_result = selector.io_read(Fiber.current, file, buffer, 0, 0)
3232
end
3333

3434
writer.transfer

test/io/event/selector/write_deadlock.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# Writer fiber that should hit EAGAIN and wait for WRITABLE
3838
writer = Fiber.new do
3939
buffer = IO::Buffer.for("test" * 64) # 256 bytes
40-
@selector.io_write(Fiber.current, local, buffer, buffer.size)
40+
@selector.io_write(Fiber.current, local, buffer, buffer.size, 0)
4141
write_completed = true
4242
end
4343

0 commit comments

Comments
 (0)