Make some changes suggested by Flog

Author: chrisseaton

doc/contributor/static-analysis.md

@@ -91,7 +91,7 @@ occasionally run this tool locally but only take its output as a suggestion.
 
 ```
 $ gem install flog
-$ flog lib/truffle lib/cext src/main
+$ flog -m -t 10 lib/truffle lib/cext src/main
 ```
 
 ### Flay

src/main/ruby/core/array.rb

@@ -1042,70 +1042,76 @@ def sample(count=undefined, options=undefined)
       end
       return [at(i), at(j)]
     else
-      if size / count > 3
-        abandon = false
+      sample_many(count, rng)
+    end
+  end
 
-        result = Array.new count
-        i = 1
+  def sample_many(count, rng)
+    if size / count > 3
+      abandon = false
 
-        result[0] = rng.rand(size)
-        while i < count
-          k = rng.rand(size)
+      result = Array.new count
+      i = 1
 
-          spin = false
-          spin_count = 0
+      result[0] = rng.rand(size)
+      while i < count
+        k = rng.rand(size)
 
-          while true # rubocop:disable Lint/LiteralInCondition
-            j = 0
-            while j < i
-              if k == result[j]
-                spin = true
-                break
-              end
+        spin = false
+        spin_count = 0
 
-              j += 1
+        while true # rubocop:disable Lint/LiteralInCondition
+          j = 0
+          while j < i
+            if k == result[j]
+              spin = true
+              break
             end
 
-            if spin
-              if (spin_count += 1) > 100
-                abandon = true
-                break
-              end
+            j += 1
+          end
 
-              k = rng.rand(size)
-            else
+          if spin
+            if (spin_count += 1) > 100
+              abandon = true
               break
             end
+
+            k = rng.rand(size)
+          else
+            break
           end
+        end
 
-          break if abandon
+        break if abandon
 
-          result[i] = k
+        result[i] = k
 
+        i += 1
+      end
+
+      unless abandon
+        i = 0
+        while i < count
+          result[i] = at result[i]
           i += 1
         end
 
-        unless abandon
-          i = 0
-          while i < count
-            result[i] = at result[i]
-            i += 1
-          end
-
-          return result
-        end
+        return result
       end
+    end
 
-      result = Array.new(self)
-
-      count.times do |c|
-        result.swap c, rng.rand(size)
-      end
+    result = Array.new(self)
 
-      return count == size ? result : result[0, count]
+    count.times do |c|
+      result.swap c, rng.rand(size)
     end
+
+    return count == size ? result : result[0, count]
   end
 
+  private :sample_many
+
   def select!(&block)
     return to_enum(:select!) { size } unless block_given?
 

src/main/ruby/core/io.rb

@@ -1065,6 +1065,18 @@ def self.select(readables=nil, writables=nil, errorables=nil, timeout=nil)
       end
     }
 
+    do_select(
+      readables, writables, errorables,
+      mark_ready, to_fds,
+      original_timeout, timeout_us,
+      readables_ready, writables_ready, errorables_ready)
+  end
+
+  def self.do_select(
+        readables, writables, errorables,
+        mark_ready, to_fds,
+        original_timeout, timeout_us,
+        readables_ready, writables_ready, errorables_ready)
     Truffle::POSIX.with_array_of_ints(to_fds.call(readables)) do |readables_ptr|
       Truffle::POSIX.with_array_of_ints(to_fds.call(writables)) do |writables_ptr|
         Truffle::POSIX.with_array_of_ints(to_fds.call(errorables)) do |errorables_ptr|
@@ -1110,6 +1122,8 @@ def self.select(readables=nil, writables=nil, errorables=nil, timeout=nil)
     end
   end
 
+  private_class_method :do_select
+
   ##
   # Opens the given path, returning the underlying file descriptor as an Integer.
   #  IO.sysopen("testfile")   #=> 3