make prcd_compile and prcd_server more robust and user-friendly.

add catch calls to prcd_server so that if the user ctrl-C's out of the
client, we have less of a risk of things hanging. add more output
to prcd_comiple so that the user gets more of an indication that things
are happening, so that they hopefully won't ctrl-C out in the middle.

Change-Id: Iecb656f029bd7b849212751be320be2d0b7ceea5
RTC: 42908
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1133
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 26 insertions, 8 deletions

diff --git a/src/build/hwpf/prcd_compile.tcl b/src/build/hwpf/prcd_compile.tcl
index 61695a27c..46e631f49 100755
--- a/src/build/hwpf/prcd_compile.tcl
+++ b/src/build/hwpf/prcd_compile.tcl
@@ -474,9 +474,18 @@ if {[llength $cmds] > 0 } {
     # to the server, waiting for a :DONE between each one.
     ##########################################################
     if {$result == ""} {   
-        puts "Connected to $server - Starting Compile"
+        puts "Connected to $server - Starting"
         foreach cmd $cmds {
             if {[info exists verbose]}  {puts "Send to hw procedure compiler:  $cmd"}
+            # display some messages so that the user doesn't get concerned..
+            if {[string first ":DRIVER" $cmd ] != -1} {
+                puts "Sending command: start extract"
+            } elseif {[string first ":HWP_COMPILE" $cmd ] != -1} {
+                puts "Sending command: start build"
+            } elseif {[string first ":HWP_RETRIEVE" $cmd ] != -1} {
+                puts "Sending command: start retrieve"
+            }
+
             if {[string compare $cmd {quit}] == 0 } {
                 puts $sockid {quit}
                 break
diff --git a/src/build/hwpf/prcd_server.tcl b/src/build/hwpf/prcd_server.tcl
index e62a0ba85..b5ead5d97 100755
--- a/src/build/hwpf/prcd_server.tcl
+++ b/src/build/hwpf/prcd_server.tcl
@@ -254,10 +254,14 @@ proc AquireData { sock } {
             flush $sock
             flush $log
         } elseif {[string compare $line ":HWP_RETRIEVE"] == 0} {
-            SendObjFiles $sock "$sb_dir/$sbname($sock)/img"
-            puts $sock ":DONE"
-            puts $log "$sock: DONE"
-            flush $sock
+            if { [catch {SendObjFiles $sock "$sb_dir/$sbname($sock)/img"} res]} {
+                puts $log "$sock: ERROR: SendObjFiles interrupted: $res\n"
+                flush $log
+            } else {
+                puts $sock ":DONE"
+                puts $log "$sock: DONE"
+                flush $sock
+            }
         } elseif {[string compare $line ":HWP_DONE"] == 0} {
             puts $sock ":DONE"
             puts $log "$sock: DONE"
@@ -276,9 +280,14 @@ proc AquireData { sock } {
                 puts $sock "Unknown command: $line"
                 puts $log "$sock: Unknown command: $line"
             }
-            puts $sock ":DONE"
-            puts $log "$sock: DONE"
-            flush $sock
+            if { [catch {puts $sock ":DONE"} res]} {
+                puts $log "$sock: ERROR: puts failed: $res\n"
+                flush $log
+            } else {
+                puts $log "$sock: DONE"
+                flush $log
+                flush $sock
+            }
         }
     }
 }