From 6967201dc5733bc613d7662084409ab5d144fccc Mon Sep 17 00:00:00 2001
From: miljenko <miljenko>
Date: Wed, 14 May 2008 13:51:08 +0000
Subject: [PATCH] Bug found by: Submitted by: Reviewed by: Approved by:
 Obtained from:

---
 exec.tcl    | 46 ++++++++++++++++++++++++++++++----------------
 initgui.tcl |  4 ++--
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/exec.tcl b/exec.tcl
index 82a1a61..61bdd69 100755
--- a/exec.tcl
+++ b/exec.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: exec.tcl,v 1.72 2008/04/28 11:32:34 miljenko Exp $
+# $Id: exec.tcl,v 1.73 2008/05/14 13:51:08 miljenko Exp $
 
 
 #****f* exec.tcl/nexec
@@ -643,6 +643,7 @@ proc deployCfg {} {
 #****
 proc vimageCleanup { eid } {
     global .c
+    global execMode
 
     set t_start [clock seconds]
     if { [catch {nexec vimage $eid vimage -lr | fgrep -v "    " | cut -d: -f 1} res] != 0 } {
@@ -656,20 +657,24 @@ proc vimageCleanup { eid } {
     set vrti 1
     set sec 60
 
-    # wm title $wi "Please wait ..."
-    set w .timewait
-    catch {destroy $w}
-    toplevel $w -takefocus 1
-    wm geometry $w +150+150
-    wm title $w "Please wait ..."
-    message $w.msg -justify left -aspect 1200 \
+    if { $execMode == "batch" } {
+        puts "\nDue to the known bug we must wait for TIME_WAIT expiration on virtual nodes (up to 60 sec). "
+        puts "Please don't try killing the process."
+    } else {
+        # wm title $wi "Please wait ..."
+        set w .timewait
+        catch {destroy $w}
+        toplevel $w -takefocus 1
+        wm geometry $w +150+150
+        wm title $w "Please wait ..."
+        message $w.msg -justify left -aspect 1200 \
          -text "\nDue to the known bug we must wait for TIME_WAIT expiration on virtual nodes (up to 60 sec). 
 Please don't try killing the process.
 (countdown on status line)\n"
-    pack $w.msg
-    update
-    grab $w
-
+        pack $w.msg
+        update
+        grab $w
+    } 
     while { $vrti == 1 } {
         set vrti 0
         foreach vimage $vimages {
@@ -679,13 +684,22 @@ Please don't try killing the process.
                 # puts "vimage $vimage: \n$odg\n"
                 after 2000 
                 set sec [expr $sec - 2]
-                statline "~ $sec sec ..."
-                pack $w.msg
-                update
+                if { $execMode == "batch" } {
+                    puts -nonewline "."
+                    flush stdout
+                } else {
+                    statline "~ $sec sec ..."
+                    pack $w.msg
+                    update
+                }
             }
         }
     }
-    destroy .timewait
+    if { $execMode == "batch" } {
+        puts ""
+    } else {
+        destroy .timewait
+    }
     # Kill all processes in all vimages
     foreach vimage $vimages {
 	set stattxt "Terminating processes in vimage $vimage"
diff --git a/initgui.tcl b/initgui.tcl
index a11adea..0b0d654 100755
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: initgui.tcl,v 1.47 2008/01/08 14:21:00 marko Exp $
+# $Id: initgui.tcl,v 1.48 2008/05/14 13:51:08 miljenko Exp $
 
 
 #****h* imunes/initgui.tcl
@@ -148,7 +148,7 @@ set def_router_model quagga
 #
 
 wm minsize . 640 400
-wm geometry . 1016x716-30+30
+wm geometry . 1016x716-20+0
 
 menu .menubar
 . config -menu .menubar -bg white
-- 
2.39.5