fix #collect_set_fds; kind of works now

rubinius · Oct 1, 2015 · acd40bd · acd40bd
1 parent 9581c69
commit acd40bd
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/kernel/common/io.rb b/kernel/common/io.rb
@@ -677,7 +677,19 @@ def self.fd_set_from_array(array)
 
     def self.collect_set_fds(array, fd_set)
       return [] unless fd_set
-      array.select { |io| fd_set.set?(io.descriptor) || io.descriptor < 0 }
+      array.map do |io|
+        key, io = if io.is_a?(Array)
+          [io[0], io[1]]
+        else
+          [io, io]
+        end
+
+        if fd_set.set?(io.descriptor) || io.descriptor < 0
+          key
+        else
+          nil
+        end
+      end.compact
     end
 
     def self.timer_add(time1, time2, result)
@@ -742,14 +754,14 @@ def self.select(readables, writables, errorables, timeout)
 
       time_limit, future = make_timeval_timeout(timeout)
       # debugging only...
-      File.open("/tmp/select", 'w+') { |file| 
-        set = read_set.to_set
-        file.puts set.class
-        file.puts set.inspect
-        file.puts set.address
-        #file.puts(set.read_array_of_char(128)) 
-      }
-
+#      file = File.open("/tmp/select", 'w+')
+#        set = read_set.to_set
+#        file.puts set.class
+#        file.puts set.inspect
+#        file.puts(sprintf("0x%x", set.address))
+#        set.read_array_of_char(10).each { |char| file.puts(sprintf("%b ", char)) }
+
+      events = 0
       loop do
         if FFI.call_failed?(events = FFI::Platform::POSIX.select(max_fd + 1,
                                                                     read_set ? read_set.to_set : nil,
@@ -765,12 +777,11 @@ def self.select(readables, writables, errorables, timeout)
 
           Errno.handle("select(2) failed")
         end
+
+        break
       end
 
       return nil if events.zero?
-
-      # this will blow up because read/write/error_set were all reset to fd_sets instead
-      # of being an FDSet instance. Fix after debugging why #select is SEGVing.
 
       output_fds = []
       output_fds << collect_set_fds(readables, read_set)