rbbt-util 5.44.1 → 6.0.4

data/lib/rbbt/util/semaphore.rb

@@ -1,148 +1,152 @@
-begin
-  require 'inline'
-  continue = true
-rescue Exception
-  Log.warn "The RubyInline gem could not be loaded: semaphore synchronization will not work"
-  continue = false
-end
-
-if continue
-  module RbbtSemaphore
-    inline(:C) do |builder|
-      builder.prefix <<-EOF
-  #include <unistd.h>
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <semaphore.h>
-  #include <time.h>
-  #include <assert.h>
-  #include <errno.h>
-  #include <signal.h>
-  #include <fcntl.h>
-      EOF
-
-      builder.c_singleton <<-EOF
-  void create_semaphore(char* name, int value){
-    sem_open(name, O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO, value);
-  }
-      EOF
-      builder.c_singleton <<-EOF
-  void delete_semaphore(char* name){
-    sem_unlink(name);
-  }
-      EOF
-
-      builder.c_singleton <<-EOF
-  int wait_semaphore(char* name){
-    int ret;
-    sem_t* sem;
-    sem = sem_open(name, 0);
-    ret = sem_wait(sem);
-    sem_close(sem);
-    return(ret);
-  }
-      EOF
-
-      builder.c_singleton <<-EOF
-  void post_semaphore(char* name){
-    sem_t* sem;
-    sem = sem_open(name, 0);
-    sem_post(sem);
-    sem_close(sem);
-  }
-      EOF
-    end
-
-    SEM_MUTEX = Mutex.new
-    def self.synchronize(sem)
-      ret = RbbtSemaphore.wait_semaphore(sem)
-      raise SemaphoreInterrupted if ret == -1
-      begin
-        yield
-      ensure
-        RbbtSemaphore.post_semaphore(sem)
-      end
-    end
-
-    def self.with_semaphore(size, file = nil)
-      if file.nil?
-        file = "/" << Misc.digest(rand(1000000000000).to_s) if file.nil?
-      else
-        file = file.gsub('/', '_') if file
-      end
-
-      begin
-        Log.debug "Creating semaphore (#{ size }): #{file}"
-        RbbtSemaphore.create_semaphore(file, size)
-        yield file
-      ensure
-        Log.debug "Removing semaphore #{ file }"
-        RbbtSemaphore.delete_semaphore(file)
-      end
-    end
-
-    def self.fork_each_on_semaphore(elems, size, file = nil)
-
-      TSV.traverse elems, :cpus => size, :bar => "Fork each on semaphore: #{ Misc.fingerprint elems }", :into => Set.new do |elem|
-        elems.annotate elem if elems.respond_to? :annotate
-        begin
-          yield elem
-        rescue Interrupt
-          Log.warn "Process #{Process.pid} was aborted"
-        end
-        nil
-      end
-      nil
-    end
-
-    def self.thread_each_on_semaphore(elems, size)
-      mutex = Mutex.new
-      count = 0
-      cv = ConditionVariable.new
-      wait_mutex = Mutex.new
-
-      begin
-
-        threads = []
-        wait_mutex.synchronize do
-          threads = elems.collect do |elem| 
-            Thread.new(elem) do |elem|
-
-              continue = false
-              mutex.synchronize do
-                while not continue do
-                  if count < size 
-                    continue = true
-                    count += 1
-                  end
-                  mutex.sleep 1 unless continue
-                end
-              end
-
-              begin
-                yield elem
-              rescue Interrupt
-                Log.error "Thread was aborted while processing: #{Misc.fingerprint elem}"
-                raise $!
-              ensure
-                mutex.synchronize do
-                  count -= 1
-                  cv.signal if mutex.locked?
-                end
-              end
-            end
-          end
-        end
-
-        threads.each do |thread| 
-          thread.join 
-        end
-      rescue Exception
-        Log.exception $!
-        Log.info "Ensuring threads are dead: #{threads.length}"
-        threads.each do |thread| thread.kill end
-      end
-    end
-  end 
-end
-
+require_relative '../refactor'
+Rbbt.require_instead 'scout/semaphore'
+
+RbbtSemaphore = ScoutSemaphore
+#begin
+#  require 'inline'
+#  continue = true
+#rescue Exception
+#  Log.warn "The RubyInline gem could not be loaded: semaphore synchronization will not work"
+#  continue = false
+#end
+#
+#if continue
+#  module RbbtSemaphore
+#    inline(:C) do |builder|
+#      builder.prefix <<-EOF
+#  #include <unistd.h>
+#  #include <stdio.h>
+#  #include <stdlib.h>
+#  #include <semaphore.h>
+#  #include <time.h>
+#  #include <assert.h>
+#  #include <errno.h>
+#  #include <signal.h>
+#  #include <fcntl.h>
+#      EOF
+#
+#      builder.c_singleton <<-EOF
+#  void create_semaphore(char* name, int value){
+#    sem_open(name, O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO, value);
+#  }
+#      EOF
+#      builder.c_singleton <<-EOF
+#  void delete_semaphore(char* name){
+#    sem_unlink(name);
+#  }
+#      EOF
+#
+#      builder.c_singleton <<-EOF
+#  int wait_semaphore(char* name){
+#    int ret;
+#    sem_t* sem;
+#    sem = sem_open(name, 0);
+#    ret = sem_wait(sem);
+#    sem_close(sem);
+#    return(ret);
+#  }
+#      EOF
+#
+#      builder.c_singleton <<-EOF
+#  void post_semaphore(char* name){
+#    sem_t* sem;
+#    sem = sem_open(name, 0);
+#    sem_post(sem);
+#    sem_close(sem);
+#  }
+#      EOF
+#    end
+#
+#    SEM_MUTEX = Mutex.new
+#    def self.synchronize(sem)
+#      ret = RbbtSemaphore.wait_semaphore(sem)
+#      raise SemaphoreInterrupted if ret == -1
+#      begin
+#        yield
+#      ensure
+#        RbbtSemaphore.post_semaphore(sem)
+#      end
+#    end
+#
+#    def self.with_semaphore(size, file = nil)
+#      if file.nil?
+#        file = "/" << Misc.digest(rand(1000000000000).to_s) if file.nil?
+#      else
+#        file = file.gsub('/', '_') if file
+#      end
+#
+#      begin
+#        Log.debug "Creating semaphore (#{ size }): #{file}"
+#        RbbtSemaphore.create_semaphore(file, size)
+#        yield file
+#      ensure
+#        Log.debug "Removing semaphore #{ file }"
+#        RbbtSemaphore.delete_semaphore(file)
+#      end
+#    end
+#
+#    def self.fork_each_on_semaphore(elems, size, file = nil)
+#
+#      TSV.traverse elems, :cpus => size, :bar => "Fork each on semaphore: #{ Misc.fingerprint elems }", :into => Set.new do |elem|
+#        elems.annotate elem if elems.respond_to? :annotate
+#        begin
+#          yield elem
+#        rescue Interrupt
+#          Log.warn "Process #{Process.pid} was aborted"
+#        end
+#        nil
+#      end
+#      nil
+#    end
+#
+#    def self.thread_each_on_semaphore(elems, size)
+#      mutex = Mutex.new
+#      count = 0
+#      cv = ConditionVariable.new
+#      wait_mutex = Mutex.new
+#
+#      begin
+#
+#        threads = []
+#        wait_mutex.synchronize do
+#          threads = elems.collect do |elem| 
+#            Thread.new(elem) do |elem|
+#
+#              continue = false
+#              mutex.synchronize do
+#                while not continue do
+#                  if count < size 
+#                    continue = true
+#                    count += 1
+#                  end
+#                  mutex.sleep 1 unless continue
+#                end
+#              end
+#
+#              begin
+#                yield elem
+#              rescue Interrupt
+#                Log.error "Thread was aborted while processing: #{Misc.fingerprint elem}"
+#                raise $!
+#              ensure
+#                mutex.synchronize do
+#                  count -= 1
+#                  cv.signal if mutex.locked?
+#                end
+#              end
+#            end
+#          end
+#        end
+#
+#        threads.each do |thread| 
+#          thread.join 
+#        end
+#      rescue Exception
+#        Log.exception $!
+#        Log.info "Ensuring threads are dead: #{threads.length}"
+#        threads.each do |thread| thread.kill end
+#      end
+#    end
+#  end 
+#end
+#

data/lib/rbbt/util/simpleopt.rb

@@ -1,8 +1,9 @@
-require 'rbbt/util/simpleopt/accessor'
-require 'rbbt/util/simpleopt/doc'
-require 'rbbt/util/simpleopt/parse'
-require 'rbbt/util/simpleopt/get'
-require 'rbbt/util/simpleopt/setup'
-
-module SOPT
-end
+Rbbt.require_instead "scout/simple_opt"
+#require 'rbbt/util/simpleopt/accessor'
+#require 'rbbt/util/simpleopt/doc'
+#require 'rbbt/util/simpleopt/parse'
+#require 'rbbt/util/simpleopt/get'
+#require 'rbbt/util/simpleopt/setup'
+#
+#module SOPT
+#end

data/lib/rbbt/util/ssh/refactor.rb

@@ -0,0 +1,19 @@
+
+class SSHLine
+  def ruby(script)
+    @output = ""
+    @complete_output = false
+    script = "require 'rbbt-util'\n" << script
+    cmd = "ruby -I ~/git/rbbt6/lib/ -e \"#{script.gsub('"','\\"')}\"\n"
+    Log.debug "Running ruby on #{@host}:\n#{ script }"
+    @ch.send_data(cmd)
+    @ch.send_data("echo DONECMD: $?\n")
+    @ssh.loop{ !@complete_output }
+    if @exit_status.to_i == 0
+      return @output
+    else
+      raise SSHProcessFailed.new @host, "Ruby script:\n#{script}"
+    end
+  end
+end
+

data/lib/rbbt/util/ssh.rb

@@ -1,118 +1,122 @@
-require 'net/ssh'
-
-class SSHLine
-
-  def initialize(host, user = nil)
-    @host = host
-    @user = user
-
-    @ssh = Net::SSH.start(@host, @user)
-
-    @ch = @ssh.open_channel do |ch|
-      ch.exec 'bash -l'
-    end
-
-    @ch.on_data do |_,data|
-      if m = data.match(/DONECMD: (\d+)\n/)
-        @exit_status = m[1].to_i
-        @output << data.sub(m[0],'')
-        serve_output 
-      else
-        @output << data
-      end
-    end
-
-    @ch.on_extended_data do |_,c,err|
-      STDERR.write err 
-    end
-  end
-
-  def send_cmd(command)
-    @output = ""
-    @complete_output = false
-    @ch.send_data(command+"\necho DONECMD: $?\n")
-  end
-
-  def serve_output
-    @complete_output = true
-  end
-
-  def run(command)
-    send_cmd(command)
-    @ssh.loop{ ! @complete_output}
-    if @exit_status.to_i == 0
-      return @output
-    else
-      raise SSHProcessFailed.new @host, command
-    end
-  end
-
-  def ruby(script)
-    @output = ""
-    @complete_output = false
-    cmd = "ruby -e \"#{script.gsub('"','\\"')}\"\n"
-    Log.debug "Running ruby on #{@host}:\n#{ script }"
-    @ch.send_data(cmd)
-    @ch.send_data("echo DONECMD: $?\n")
-    @ssh.loop{ !@complete_output }
-    if @exit_status.to_i == 0
-      return @output
-    else
-      raise SSHProcessFailed.new @host, "Ruby script:\n#{script}"
-    end
-  end
-
-  def rbbt(script)
-    rbbt_script =<<-EOF
-require 'rbbt-util'
-require 'rbbt/workflow'
-
-  res = begin
-      old_stdout = STDOUT.dup; STDOUT.reopen(STDERR)
-#{script}
-      ensure
-        STDOUT.reopen(old_stdout)
-      end
-
-  puts Marshal.dump(res)
-    EOF
-
-    m = ruby(rbbt_script)
-    Marshal.load m
-  end
-
-  def workflow(workflow, script)
-    preamble =<<-EOF
-wf = Workflow.require_workflow('#{workflow}')
-    EOF
-
-    rbbt(preamble + "\n" + script)
-  end
-
-  @connections = {}
-  def self.open(host, user = nil)
-    @connections[[host, user]] ||= SSHLine.new host, user
-  end
-
-  def self.run(server, cmd, options = nil)
-    cmd = cmd * " " if Array === cmd
-    cmd += " " + CMD.process_cmd_options(options) if options
-    open(server).run(cmd)
-  end
-
-  def self.ruby(server, script)
-    open(server).ruby(script)
-  end
-
-  def self.rbbt(server, script)
-    open(server).rbbt(script)
-  end
-
-  def self.workflow(server, workflow, script)
-    open(server).workflow(workflow, script)
-  end
-
-  def self.command(server, command, argv = [], options = nil)
-    run(server, [command] + argv, options)
-  end
-end
+require_relative '../refactor'
+Rbbt.require_instead 'scout/offsite/ssh'
+require_relative 'ssh/refactor'
+
+#require 'net/ssh'
+#
+#class SSHLine
+#
+#  def initialize(host, user = nil)
+#    @host = host
+#    @user = user
+#
+#    @ssh = Net::SSH.start(@host, @user)
+#
+#    @ch = @ssh.open_channel do |ch|
+#      ch.exec 'bash -l'
+#    end
+#
+#    @ch.on_data do |_,data|
+#      if m = data.match(/DONECMD: (\d+)\n/)
+#        @exit_status = m[1].to_i
+#        @output << data.sub(m[0],'')
+#        serve_output 
+#      else
+#        @output << data
+#      end
+#    end
+#
+#    @ch.on_extended_data do |_,c,err|
+#      STDERR.write err 
+#    end
+#  end
+#
+#  def send_cmd(command)
+#    @output = ""
+#    @complete_output = false
+#    @ch.send_data(command+"\necho DONECMD: $?\n")
+#  end
+#
+#  def serve_output
+#    @complete_output = true
+#  end
+#
+#  def run(command)
+#    send_cmd(command)
+#    @ssh.loop{ ! @complete_output}
+#    if @exit_status.to_i == 0
+#      return @output
+#    else
+#      raise SSHProcessFailed.new @host, command
+#    end
+#  end
+#
+#  def ruby(script)
+#    @output = ""
+#    @complete_output = false
+#    cmd = "ruby -e \"#{script.gsub('"','\\"')}\"\n"
+#    Log.debug "Running ruby on #{@host}:\n#{ script }"
+#    @ch.send_data(cmd)
+#    @ch.send_data("echo DONECMD: $?\n")
+#    @ssh.loop{ !@complete_output }
+#    if @exit_status.to_i == 0
+#      return @output
+#    else
+#      raise SSHProcessFailed.new @host, "Ruby script:\n#{script}"
+#    end
+#  end
+#
+#  def rbbt(script)
+#    rbbt_script =<<-EOF
+#require 'rbbt-util'
+#require 'rbbt/workflow'
+#
+#  res = begin
+#      old_stdout = STDOUT.dup; STDOUT.reopen(STDERR)
+##{script}
+#      ensure
+#        STDOUT.reopen(old_stdout)
+#      end
+#
+#  puts Marshal.dump(res)
+#    EOF
+#
+#    m = ruby(rbbt_script)
+#    Marshal.load m
+#  end
+#
+#  def workflow(workflow, script)
+#    preamble =<<-EOF
+#wf = Workflow.require_workflow('#{workflow}')
+#    EOF
+#
+#    rbbt(preamble + "\n" + script)
+#  end
+#
+#  @connections = {}
+#  def self.open(host, user = nil)
+#    @connections[[host, user]] ||= SSHLine.new host, user
+#  end
+#
+#  def self.run(server, cmd, options = nil)
+#    cmd = cmd * " " if Array === cmd
+#    cmd += " " + CMD.process_cmd_options(options) if options
+#    open(server).run(cmd)
+#  end
+#
+#  def self.ruby(server, script)
+#    open(server).ruby(script)
+#  end
+#
+#  def self.rbbt(server, script)
+#    open(server).rbbt(script)
+#  end
+#
+#  def self.workflow(server, workflow, script)
+#    open(server).workflow(workflow, script)
+#  end
+#
+#  def self.command(server, command, argv = [], options = nil)
+#    run(server, [command] + argv, options)
+#  end
+#end