run: capture kernel msg to detect boot errors

Handle boot errors like the old run tool did by checking a kernel
specific string on boot up and start the run script timeout afterwards.

Issue #1395.

tool/run/boot_dir/fiasco

@@ -59,6 +59,11 @@ proc bin_dir { } {
 set fiasco_serial_esc_arg "-serial_esc "
 
 
+proc run_boot_string { } {
+	return "L4 Bootstrapper"
+}
+
+
 ##
 # Populate boot directory with binaries on fiasco
 #

tool/run/boot_dir/foc

@@ -240,6 +240,11 @@ proc run_boot_dir_arm {binaries} {
 }
 
 
+proc run_boot_string { } {
+	return "L4 Bootstrapper"
+}
+
+
 ##
 # Populate boot directory with binaries on fiasco.OC
 #

tool/run/boot_dir/hw

@@ -10,6 +10,11 @@ proc run_boot_dir_hook { } {
 }
 
 
+proc run_boot_string { } {
+	return "kernel initialized"
+}
+
+
 ##
 # Populate boot directory with binaries on hw
 #

tool/run/boot_dir/nova

@@ -24,6 +24,11 @@ proc nova_external { } {
 }
 
 
+proc run_boot_string { } {
+	return "NOVA Microhypervisor"
+}
+
+
 ##
 # Populate directory with binaries on NOVA
 #

tool/run/boot_dir/okl4

@@ -101,6 +101,11 @@ set weaver_xml_template {
 }
 
 
+proc run_boot_string { } {
+	return "OKL4 -"
+}
+
+
 ##
 # Populate directory with binaries on OKL4
 #

tool/run/boot_dir/pistachio

@@ -63,6 +63,11 @@ proc kernel_external { } {
 }
 
 
+proc run_boot_string { } {
+	return "L4Ka::Pistachio -"
+}
+
+
 ##
 # Populdate boot directory with binaries on pistachio
 #

tool/run/log/serial

@@ -22,21 +22,25 @@ proc log_serial_cmd { } {
 proc run_log { wait_for_re timeout_value } {
 	global output_spawn_id
 
-	set timeout 60
-	while {true} {
-		eval spawn [log_serial_cmd]
-		set output_spawn_id $spawn_id
-		expect {
-			"Genode \[0-9]\[0-9]\.\[0-9]\[0-9]"  {
-				wait_for_output $wait_for_re $timeout_value $output_spawn_id;
-				return true;
-			}
-			eof          { continue; }
-			timeout      {
-				puts stderr "Boot process timed out";
-				close;
-				return false;
-			}
+	set kernel_msg [run_boot_string]
+
+	eval spawn [log_serial_cmd]
+	set output_spawn_id $spawn_id
+
+	set timeout 210
+	expect {
+		$kernel_msg { }
+		eof         {
+			puts stderr "Serial command process died unexpectedly"
+			return false
+		}
+		timeout     {
+			puts stderr "Boot process timed out"
+			close
+			return false
 		}
 	}
+
+	wait_for_output $wait_for_re $timeout_value $output_spawn_id
+	return true
 }

tool/run/run

@@ -489,6 +489,10 @@ proc wait_for_output { wait_for_re timeout_value running_spawn_id } {
 ## Fall-back implementations of all run module procedures
 ##
 
+##
+# Dummy boot_string procedure
+proc run_boot_string { } { return ""; }
+
 ##
 # Dummy boot_dir maodule
 proc run_boot_dir { } { return true; }