X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f5efedb7e873fa0c82bdc8bb0aa78ae3e827c7..f27c0d4560fe83cc032b50b681ee2e6e955b7f71:/src/bindings/ruby/simgrid.rb

diff --git a/src/bindings/ruby/simgrid.rb b/src/bindings/ruby/simgrid.rb
index 2cfeacf13c..daa12ea2a4 100644
--- a/src/bindings/ruby/simgrid.rb
+++ b/src/bindings/ruby/simgrid.rb
@@ -1,3 +1,5 @@
+# FIXME: add license like in C files
+
 require 'simgrid_ruby'
 require 'thread'
 
@@ -52,83 +54,30 @@ class MSG::Process < Thread
   @@nextProcessId = 0
 
 # Attributes
-  attr_reader :bind, :id            # Read only
-  attr_accessor :name, :properties, :pargs  # R/W
+  attr_reader :bind, :id, :name, :pargs # Read only
+  attr_accessor :properties             # R/W 
   
-# Initialize : Used from ApplicationHandler to fill it in
-  def initialize(*args)
-    # FIXME: use only one variante (the one with 3 args) and kill the others
+
+    def initialize(*args)
+      super(){
+	
+     raise "Bad Number Of arguments to create a a Ruby Process (name,args,prop) " if args.size < 3
+     
     @schedBegin = Semaphore.new(0)
     @schedEnd = Semaphore.new(0)    
-    @properties = Hash.new()
+    #@properties = Hash.new() FIXME: get this from the C (yep that makes 4 args to this function)
     @id = @@nextProcessId++
+    @name = args[0]
+    @pargs = args[1]
+    @properties = args[2]
     
-    argc = args.size
-
-    if argc == 0 # Default initializer
-      super() {
-        @id = 0
-        @bind = 0
-        @name = ""
-        @pargs = Array.new()
-        start()
-        MSG::debug "Initializer without any argument"
-      }
-       
-    # 2 arguments: (HostName,Name) Or (Host , Name)
-    elsif argc == 2   
-      super(){
-        MSG::debug "Initilize with 2 args"
-        type = args[0].type()
-        if ( type.to_s == "String")
-          host = Host.getByName(args[0])
-        elsif ( type.to_s == "MSG::Host")
-          host = args[0]
-        else 
-          raise "first argument of type "+args[0].type().to_s+", but expecting either String or MSG::Host"
-        end
-        if $DEBUG
-          puts host
-        end
-        raise "Process name cannot be null" if args[1].empty?
-        @name = args[1] 
-        if $DEBUG
-          puts @name
-        end
-        @pargs = Array.new()    # No Args[] Passed in Arguments
-        start()
-        createProcess(self,host)
+     start()
+      
       }
-       
-    # 3 arguments: (hostName,Name,args[]) or (Host,Name,args[])
-    elsif argc == 3  
-      super(){
-      	MSG::debug "Initilize with 3 args"
-        type = args[0].type()
-        if ( type.to_s == "String")
-          host = Host.getByName(args[0])
-        elsif ( type.to_s == "MSG::Host")
-          host = args[0]
-        else 
-          raise "first argument of type "+args[0].type().to_s+", but expecting either String or MSG::Host"
-        end
-        if $DEBUG
-          puts host
-        end
       
-        raise "Process name cannot be null" if args[1].empty?
-        @name = args[1]
-        type = args[2].type()
-        raise "Third argument should be an Array" if type != "Array"
-        @pargs = args[3]
-        createProcess(self,host)  
-        
-	   }
-  else 
-    raise "Bad number of argument: Expecting either 1, 2 or 3, but got "+argc.to_s
-  end
     end
-  
+    
+    
   # main
   def main(args) 
     # To be overriden by childs
@@ -145,31 +94,14 @@ class MSG::Process < Thread
     @schedEnd.release
   end
     
-  def processList() (KILLME?)
-    Thread.list.each {|t| p t}
-  end
-  
-  #Get Own ID (KILLME?)
-  def getID()
-    return @id
-  end
-  
-  #Get a Process ID (KILLME?)
-  def processID(process)
-    return process.id
-  end
-  
-  #Get Own Name (KILLME?)
-  def getName()
-    return @name
-  end
+
   
-  #Get Bind (KILLME?)
+  # Get Bind
   def getBind()
     return @bind
   end
   
-  #Get Binds (KILLME?)
+  # Set Binds
   def setBind(bind)
     @bind = bind
   end
@@ -184,72 +116,25 @@ class MSG::Process < Thread
     @schedEnd.acquire
   end
   
-   #C Simualator Process Equivalent  Management
-  # After Binding Ruby Process to C Process
-  
-#   pause
   def pause()
     processSuspend(self)
   end
   
-#   restart
   def restart()
     processResume(self)
   end
   
-#   isSuspended
   def isSuspended()
     processIsSuspended(self)
   end
   
-#   getHost
   def getHost()
     processGetHost(self)
   end
   
-# The Rest of Methods !!! To be Continued ...
+# The Rest of Methods !!! To be Continued ... FIXME: what's missing?
 end
 
-#########################################################################
-# Class ApplicationHandler
-#########################################################################
-class ApplicationHandler
-  def initialize()
-    @hostName = nil
-    @function = nil
-  end
-  
-  def onBeginProcess(hostName,function)
-    @args = Array.new
-    @properties = Hash.new
-    
-    @hostName = hostName
-    @function = function
-      
-    MSG::debug("onBeginProcess("+hostName+","+function+")")
-  end
-
-  def onProperty(id,value)
-    @properties[id] = value
-  end
-  
-  def onProcessArg(arg)
-    @args.push(arg)
-  end
-
-  def onEndProcess()
-    # must be in C, called from a callback to the FlexML parser 
-    # newInstance must take args and hostname as argument to initialize everything, *and* bind it to C element
-    # Allows to mark all attributes of process (but properties) to read-only
-    process = MSG::rubyNewInstance(@function) 
-    process.pargs = @args
-    process.name = @function
-    host = MSG::Host.getByName(@hostName)
-    MSG::processCreate(process,host)
-    process.properties = @properties
-  end
-end
- 
 #########################
 # Main chunck 
 #########################