ns-lib.tcl.diffs

it is very important

*** ns-lib.tcl.original	Mon Oct 30 14:10:59 2000
--- ns-lib.tcl	Tue Oct 24 11:45:01 2000
***************
*** 192,197 ****
--- 192,202 ----
  source ns-default.tcl
  source ../emulate/ns-emulate.tcl
  
+ # GFR Additions
+ source ../nix/ns-nix.tcl
+ source ../nix/nix-default.tcl
+ # End GFR Additions
+  
  # Obsolete modules
  #source ns-wireless-mip.tcl
  #source ns-nam.tcl
***************
*** 698,703 ****
--- 703,710 ----
  }
  
  Simulator instproc run {} {
+ 	global runstart
+ 	set runstart [clock seconds]
  	$self check-node-num
  	$self rtmodel-configure			;# in case there are any
  	[$self get-routelogic] configure
***************
*** 710,715 ****
--- 717,726 ----
  	#
  	foreach nn [array names Node_] {
  		$Node_($nn) reset
+ 		# GFR Additions for NixVector Routing
+ 		if { [Simulator set nix-routing] } {
+ 			$Node_($nn) populate-objects
+ 		}
  	}
  	#
  	# Also reset every queue
***************
*** 722,730 ****
--- 733,750 ----
  	# Do all nam-related initialization here
  	$self init-nam
  
+ 	global simstart
+ 	set simstart [clock seconds]
  	return [$scheduler_ run]
  }
  
+ Simulator instproc log-simstart { } {
+         # GFR Modification to log actual start
+         global simstart
+         puts "Starting Actual Simulation"
+         set simstart [clock seconds]
+ }
+ 
  Simulator instproc halt {} {
  	$self instvar scheduler_
  	$scheduler_ halt
***************
*** 904,909 ****
--- 924,935 ----
  	}
  	eval $self simplex-link $n1 $n2 $bw $delay $type $args
  	eval $self simplex-link $n2 $n1 $bw $delay $type $args
+ 	# Modified by GFR for nix-vector routing
+ 	if { [Simulator set nix-routing] } {
+ 		# Inform nodes of neighbors
+ 		$n1 set-neighbor [$n2 id]
+ 		$n2 set-neighbor [$n1 id]
+ 	}
  }
  
  Simulator instproc duplex-intserv-link { n1 n2 bw pd sched signal adc args } {