From: numa <numa@numa-ubuntu-vm.(none)>
Date: Mon, 31 Aug 2009 12:14:30 +0000 (+0200)
Subject: u ovom stanju exec funkcije ispisuju sve korake prilikom jednog pokretanja jednostavn... 
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=290923159407db62107ad63a7bf996f5ff606703;p=imunes.git

u ovom stanju exec funkcije ispisuju sve korake prilikom jednog pokretanja jednostavnog eksperimenta
(cherry picked from commit 21dc367e2f539bc8bbb811bfb50784962c1523e1)

Signed-off-by: Josip Rodin <joy@CNZGRIJRL.carpriv.carnet.hr>
---

diff --git a/exec.tcl b/exec.tcl
index 67e960b..8e355ff 100755
--- a/exec.tcl
+++ b/exec.tcl
@@ -99,6 +99,8 @@ proc setOperMode { mode } {
     global activetool
     global editor_only remote_exec execSock
 
+	puts "setOperMode $mode"
+
     if { $mode == "exec" } { ;# let's try something, sockets should be opened
 	nexec id -u
 	if { $editor_only } { ;# if set in nexec or open_exec_sockets
@@ -228,9 +230,10 @@ proc statline {line} {
 #   * name -- the name of the new interface
 #****
 proc createIfc { eid type hook } {
+    puts "usli u createIfc $eid $type $hook"
+    return false
     catch { exec printf "mkpeer $type $hook $hook \n show .$hook" | vimage $eid ngctl -f - } nglist
     return [lindex $nglist 1]
-    return false
 }
 
 
@@ -254,16 +257,18 @@ proc l3node.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
     global mac_byte4 mac_byte5
 
+	puts "l3node.instantiate $eid $node"
+
     set node_id "$eid\.$node"
-    nexec vimage -c $node_id
-    nexec vimage $node_id hostname [getNodeName $node]
-    nexec vimage $node_id sysctl vfs.morphing_symlinks=1
+    puts "	nexec vimage -c $node_id				"
+    puts "	nexec vimage $node_id hostname [getNodeName $node]	"
+    puts "	nexec vimage $node_id sysctl vfs.morphing_symlinks=1	"
 
     foreach ifc [ifcList $node] {
 	switch -exact [string range $ifc 0 2] {
 	    eth {
 		set ifid [createIfc $eid eiface ether]
-		nexec vimage $eid vimage -i $node $ifid $ifc
+		puts "	nexec vimage $eid vimage -i $node $ifid $ifc	"
 
 		set peer [peerByIfc $node $ifc]
 		if { [nodeType $peer] == "rj45" } {
@@ -277,7 +282,7 @@ proc l3node.instantiate { eid node } {
 			incr mac_byte4
 		    }
 		}
-		nexec vimage $node_id ifconfig $ifc link $ether
+		puts "	nexec vimage $node_id ifconfig $ifc link $ether	"
 		set ngnodemap($ifc@$node_id) $ifid
 	    }
 	    ser {
@@ -298,19 +303,21 @@ proc l3node.instantiate { eid node } {
     set cpumax [lindex [lsearch -inline $cpuconf {max *}] 1]
     set cpuweight [lindex [lsearch -inline $cpuconf {weight *}] 1]
     if { $cpumin != "" } {
-	nexec vimage -m $node_id cpumin $cpumin
+	puts {	nexec vimage -m $node_id cpumin $cpumin		}
     }
     if { $cpumax != "" } {
-	nexec vimage -m $node_id cpumax $cpumax
+	puts {	nexec vimage -m $node_id cpumax $cpumax		}
     }
     if { $cpuweight != "" } {
-	nexec vimage -m $node_id cpuweight $cpuweight
+	puts {	nexec vimage -m $node_id cpuweight $cpuweight	}
     }
 
+	puts "	
     nexec vimage $node_id sysctl net.inet.icmp.bmcastecho=1
     nexec vimage $node_id sysctl net.inet.icmp.icmplim=0
     nexec vimage $node_id ifconfig lo0 inet localhost
     nexec vimage $node_id route add 224.0.0.0/4 localhost
+    								"
 }
 
 
@@ -360,15 +367,18 @@ proc l3node.start { eid node } {
     global remote_exec execSock
     global viewcustomid
     
+    	puts "l3node.start $eid $node"
+    
     set node_id "$eid\.$node"
     set node_dir "/tmp/$eid/$node"
 
+    puts "	recreating $node_dir"
     nexec rm -fr $node_dir
     nexec mkdir $node_dir
     nexec chmod 1777 $node_dir
     foreach ifc [ifcList $node] {
 	set mtu [getIfcMTU $node $ifc]
-	nexec vimage $node_id ifconfig $ifc mtu $mtu
+	puts "	nexec vimage $node_id ifconfig $ifc mtu $mtu	"
     }
 
     set check [info exists viewcustomid]
@@ -406,17 +416,19 @@ proc l3node.start { eid node } {
 	close $setkeyFileId
 
 	set errorstr ""
-	set error [catch "nexec vimage $node_id setkey -f \
-	    $node_dir/setkey.conf" errorstr]
-	if { $error == "1" } {
-	    setkeyError $node_id $errorstr
-	}
+	puts "	doing the set error setkeyError"
+#	set error [catch "nexec vimage $node_id setkey -f \
+#	    $node_dir/setkey.conf" errorstr]
+#	if { $error == "1" } {
+#	    setkeyError $node_id $errorstr
+#	}
     }
     
     if { $bootcmd == "" || $bootcfg =="" } {
 	set bootcfg [[typemodel $node].cfggen $node]
 	set bootcmd [[typemodel $node].bootcmd $node]
     }
+    puts "	imamo typemodel=[typemodel $node] bootcfg=$bootcfg i bootcmd=$bootcmd"
     if { ! $remote_exec } {
 	set fileId [open $node_dir/boot.conf w]
 	foreach line $bootcfg {
@@ -431,7 +443,7 @@ proc l3node.start { eid node } {
     	nexec close_conf_file
     }
 
-    catch "nexec vimage $node_id $bootcmd $node_dir/boot.conf >& $node_dir/out.log &"
+    puts "	catch nexec vimage $node_id $bootcmd $node_dir/boot.conf >& $node_dir/out.log &"
 }
 
 #****f* exec.tcl/l3node.shutdown 
@@ -511,6 +523,8 @@ proc deployCfg {} {
     global remote_exec
     global eid_base
 
+	puts "deployCfg"
+
     set mac_byte4 0
     set mac_byte5 0
 
@@ -581,18 +595,19 @@ proc deployCfg {} {
 	    [lindex [[typemodel $lnode1].nghook $eid $lnode1 $ifname1] 1]
 	set nghook2 \
 	    [lindex [[typemodel $lnode2].nghook $eid $lnode2 $ifname2] 1]
-	nexec vimage $eid ngctl mkpeer $ngpeer1: pipe $nghook1 upper
-	nexec vimage $eid ngctl name $ngpeer1:$nghook1 $lname
-	nexec vimage $eid ngctl connect $lname: $ngpeer2: lower $nghook2
+
+	puts "	nexec vimage $eid ngctl mkpeer $ngpeer1: pipe $nghook1 upper		"
+	puts "	nexec vimage $eid ngctl name $ngpeer1:$nghook1 $lname			"
+	puts "	nexec vimage $eid ngctl connect $lname: $ngpeer2: lower $nghook2	"
 
 	# Ethernet frame has a 14-byte header - this is a temp. hack!!!
-	nexec vimage $eid ngctl msg $lname: setcfg "{ header_offset=14 }"
+	puts "	nexec vimage $eid ngctl msg $lname: setcfg { header_offset=14 }	"
 
 	# Link parameters
-	nexec vimage $eid ngctl msg $lname: setcfg \
-	    "{ bandwidth=$bandwidth delay=$delay \
-	    upstream={ BER=$ber duplicate=$dup } \
-	    downstream={ BER=$ber duplicate=$dup } }"
+	puts "	nexec vimage $eid ngctl msg $lname: setcfg 
+	    { bandwidth=$bandwidth delay=$delay 
+	    upstream={ BER=$ber duplicate=$dup } 
+	    downstream={ BER=$ber duplicate=$dup } }					"
 
 	# Queues
 	foreach node [list $lnode1 $lnode2] {
@@ -648,6 +663,8 @@ proc vimageCleanup { eid } {
     global .c
     global execMode
 
+	puts "vimageCleanup $eid"
+
     set t_start [clock seconds]
     if { [catch {nexec vimage $eid vimage -lr | fgrep -v "    " | cut -d: -f 1} res] != 0 } {
 	return
@@ -753,6 +770,10 @@ Please don't try killing the process.
 #   qdisc -- queuing discipline
 #****
 proc execSetIfcQDisc { eid node ifc qdisc } {
+
+	puts "execSetIfcQDisc $eid $node $ifc $qdisc"
+	return
+	
     set target [linkByIfc $node $ifc]
     set peers [linkPeers [lindex $target 0]]
     set dir [lindex $target 1]
@@ -791,6 +812,10 @@ proc execSetIfcQDisc { eid node ifc qdisc } {
 #   qdrop -- queue dropping policy
 #****
 proc execSetIfcQDrop { eid node ifc qdrop } {
+
+	puts "execSetIfcQDrop $eid $node $ifc $qdrop"
+	return
+
     set target [linkByIfc $node $ifc]
     set peers [linkPeers [lindex $target 0]]
     set dir [lindex $target 1]
@@ -828,6 +853,10 @@ proc execSetIfcQDrop { eid node ifc qdrop } {
 #   qlen -- new queue's length
 #****
 proc execSetIfcQLen { eid node ifc qlen } {
+
+	puts "execSetIfcQLen $eid $node $ifc $qlen"
+	return
+
     set target [linkByIfc $node $ifc]
     set peers [linkPeers [lindex $target 0]]
     set dir [lindex $target 1]
@@ -861,6 +890,10 @@ proc execSetIfcQLen { eid node ifc qlen } {
 #   link -- link id
 #****
 proc execSetLinkParams { eid link } {
+
+	puts "execSetLinkParams $eid $link"
+	return
+
     set lnode1 [lindex [linkPeers $link] 0]
     set lnode2 [lindex [linkPeers $link] 1]
     set lname $lnode1-$lnode2