From ee92073d8d2d48eb7f070a8542430a7d5177e6bd Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 2 Jan 2017 04:20:54 +0000 Subject: buffer/splice: remove MAX_SIZE constant We do not need it at runtime, only for testing on Linux-like systems --- lib/dtas/buffer/splice.rb | 1 - test/test_buffer.rb | 16 ++++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/dtas/buffer/splice.rb b/lib/dtas/buffer/splice.rb index 60cc921..1cb0fbc 100644 --- a/lib/dtas/buffer/splice.rb +++ b/lib/dtas/buffer/splice.rb @@ -10,7 +10,6 @@ require_relative '../pipe' module DTAS::Buffer::Splice # :nodoc: MAX_AT_ONCE = 4096 # page size in Linux MAX_AT_ONCE_1 = 65536 - MAX_SIZE = File.read("/proc/sys/fs/pipe-max-size").to_i F_MOVE = IO::Splice::F_MOVE def buffer_size diff --git a/test/test_buffer.rb b/test/test_buffer.rb index aa1e3c2..0fb4fba 100644 --- a/test/test_buffer.rb +++ b/test/test_buffer.rb @@ -6,6 +6,10 @@ require 'stringio' require 'dtas/buffer' class TestBuffer < Testcase + + @@max_size = File.read("/proc/sys/fs/pipe-max-size").to_i + @@max_size = nil if @@max_size == 0 + def teardown @to_close.each { |io| io.close unless io.closed? } end @@ -43,16 +47,16 @@ class TestBuffer < Testcase def test_set_buffer_size buf = new_buffer - buf.buffer_size = DTAS::Buffer::MAX_SIZE - assert_equal DTAS::Buffer::MAX_SIZE, buf.buffer_size - end if defined?(DTAS::Buffer::MAX_SIZE) + buf.buffer_size = @@max_size + assert_equal @@max_size, buf.buffer_size + end if @@max_size def test_buffer_size buf = new_buffer assert_operator buf.buffer_size, :>, 128 - buf.buffer_size = DTAS::Buffer::MAX_SIZE - assert_equal DTAS::Buffer::MAX_SIZE, buf.buffer_size - end if defined?(DTAS::Buffer::MAX_SIZE) + buf.buffer_size = @@max_size + assert_equal @@max_size, buf.buffer_size + end if @@max_size def test_broadcast_1 buf = new_buffer -- cgit v1.2.3-24-ge0c7