Merge branch 'master' of research:~rosejn/gosim

rosejn · Feb 28, 2007 · 524978d · 524978d
2 parents 71a41f8 + a0a69ab
commit 524978d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/gosim/network.rb b/lib/gosim/network.rb
@@ -88,6 +88,7 @@ def alive?
       end
 
       def alive=(status)
+        log "Setting alive= on #{nid}"
         @alive = status
         @topo.node_alive(@addr, @alive)
       end

diff --git a/lib/gosim/simulation.rb b/lib/gosim/simulation.rb
@@ -28,7 +28,6 @@ def reset
 
     def set_timeout(time, is_periodic = false, &block)
       SimTimeout.new(time, is_periodic, block)
-      #log "#{@sid}: Timeout set for #{time}"
     end
 
     def inspect
@@ -199,7 +198,7 @@ def run(end_time = MAX_INT)
           @entities[cur_event.dest_id].send(cur_event.event_id, cur_event.data) 
         end
       rescue Exception => e
-        error "error occurred sending:\n#{cur_event.data.inspect}\nto destination: #{cur_event.dest_id}.#{cur_event.event_id}"
+        error "GoSim error occurred sending:\n#{cur_event.data.inspect}\nto destination: #{cur_event.dest_id}.#{cur_event.event_id}"
         puts "Exception: #{e}"
         print e.backtrace.join("\n")
         stop

diff --git a/test/benchmark.rb b/test/benchmark.rb
@@ -1,6 +1,8 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'rational'
 require 'gosim'
+
 require 'rubygems'
 require 'benchmark'