From: ian <ian>
Date: Wed, 5 Jul 2006 21:25:46 +0000 (+0000)
Subject: finish logging and safety_panic
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=429f724d10ad441a12fb7dd13f23038cb0582b5c;p=trains.git

finish logging and safety_panic
---

diff --git a/hostside/common.h b/hostside/common.h
index 008d219..83754b3 100644
--- a/hostside/common.h
+++ b/hostside/common.h
@@ -93,6 +93,8 @@ void diee(const char *fmt, ...) __attribute__((noreturn,format(printf,1,2)));
 void diem(void) __attribute__((noreturn));
 
 void die_hook(void);
+void die_vprintf_hook(const char *fmt, va_list al)
+     __attribute__((format(printf,1,0)));
 
 void *mmalloc(size_t sz);
 char *mstrdupl(const char *s, int l);
diff --git a/hostside/errorcodes.h.gen b/hostside/errorcodes.h.gen
index f624b0e..a3093dc 100755
--- a/hostside/errorcodes.h.gen
+++ b/hostside/errorcodes.h.gen
@@ -1,10 +1,31 @@
 #!/usr/bin/perl
-print "typedef enum {\n" or die $!;
-foreach $f (qw(
-	       OK
-	       Safety
-	       )) {
-    $_= $f; s/\-//g;
-    printf "  EC_%s,\n", $_;
-}
-print "} ErrorCode;\n" or die $!;
+
+@f= qw(
+       OK
+       Safety
+       );
+
+
+    
+$decl= "const char *const errorcodelist[]";
+
+print <<END
+typedef enum {
+END
+    ."  ".(join ",\n  ", map {
+	$f=$_; $f =~ s/\-//g; "EC_$f";
+    } @f).<<END
+
+} ErrorCode;
+
+extern $decl;
+#define DEFINE_ERRORCODELIST_DATA \\
+$decl= { \\
+END
+    ."  ".(join ", \\\n  ", map {
+	'"'.(lc).'"';
+    } @f).<<END
+ \\
+};
+END
+    or die $!;
diff --git a/hostside/gui-plan.c b/hostside/gui-plan.c
index 961ef19..9e1f592 100644
--- a/hostside/gui-plan.c
+++ b/hostside/gui-plan.c
@@ -58,6 +58,7 @@ static const char *badcmdreport_data;
 static size_t badcmdreport_recsz;
 
 void die_hook(void) { }
+void die_vprintf_hook(const char *fmt, va_list al) { }
 
 static void diex(const char *fn, const char *w) __attribute__((noreturn));
 static void diex(const char *fn, const char *w) {
diff --git a/hostside/main.c b/hostside/main.c
index f14a5df..6ea07ec 100644
--- a/hostside/main.c
+++ b/hostside/main.c
@@ -28,6 +28,7 @@ static const char *serial_port;
 static Nmra buf;
 
 void die_hook(void) { }
+void die_vprintf_hook(const char *fmt, va_list al) { }
 
 static void badusage(const char *why) {
   fprintf(stderr,"bad usage: %s\n",why); exit(8);
diff --git a/hostside/realtime.c b/hostside/realtime.c
index fa1e3d4..cb8274c 100644
--- a/hostside/realtime.c
+++ b/hostside/realtime.c
@@ -40,13 +40,6 @@ static void *read_exception(oop_source *evts, int fd,
 
 /*---------- logging etc. ----------*/
 
-void logmsg(ErrorCode ec, TrainNum tran, SegmentNum segn,const char *fmt,...) {
-  va_list al;
-  va_start(al,fmt);
-  vlogmsg(ec,tran,segn,fmt,al);
-  va_end(al);
-}
-
 static char *transegn2suffixstring(TrainNum tran, SegmentNum segn) {
   /* Either arg may be NOTA(...), in which case it's not included.
    * Result string will be empty, or start with ": "
@@ -57,8 +50,8 @@ static char *transegn2suffixstring(TrainNum tran, SegmentNum segn) {
   char *s;
   int r;
 
-  seg= ~segn ? info_segments[segn].pname : 0;
-  tra= ~tran ? info_trains[tran].pname : 0;
+  seg= SOMEP(segn) ? info_segments[segn].pname : 0;
+  tra= SOMEP(tran) ? info_trains[tran].pname : 0;
 
   r= asprintf(&s, "%s%s%s%s%s",
 	      seg||tra ? ":" : "",
@@ -71,8 +64,29 @@ static char *transegn2suffixstring(TrainNum tran, SegmentNum segn) {
   return s;
 }
 
+void vlogmsg(ErrorCode ec, TrainNum tran, SegmentNum segn,
+	     const char *fmt, va_list al) {
+  oprintf(UPO, "message %s ", ec ? errorcodelist[ec] : "info");
+  ovprintf(UPO,fmt,al);
+  if (SOMEP(segn) || SOMEP(tran)) oprintf(UPO, ":");
+  if (SOMEP(segn)) oprintf(UPO, " @%s", info_segments[segn].pname);
+  if (SOMEP(tran)) oprintf(UPO, " %s",  info_trains[tran].pname);
+  oprintf(UPO, "\n");
+}
+
+void logmsg(ErrorCode ec, TrainNum tran, SegmentNum segn,const char *fmt,...) {
+  va_list al;
+  va_start(al,fmt);
+  vlogmsg(ec,tran,segn,fmt,al);
+  va_end(al);
+}
+
 void safety_vpanic(TrainNum tran, SegmentNum segn,const char *fmt,va_list al) {
   char *msg, *where;
+  PicInsn piob;
+
+  enco_pic_off(&piob);
+  serial_transmit(&piob);
 
   if (vasprintf(&msg,fmt,al) < 0)
     diee("vasprintf failed in safety_vpanic fmt=\"%s\"", fmt);
@@ -126,8 +140,12 @@ void ouhex(const char *word, const Byte *command, int length) {
   }
   oprintf(UPO, "\n");
 }
-
-void die_hook() {
+ 
+void die_vprintf_hook(const char *fmt, va_list al) {
+  ovprintf(UPO, fmt, al);
+}
+ 
+void die_hook(void) {
   int e;
   e= obc_tryflush(UPO);
   if (e) fprintf(stderr,"(unwritten command output: %s)\n",strerror(e));
@@ -231,3 +249,5 @@ int main(int argc, const char **argv) {
   oop_sys_run(sys_events);
   abort();
 }
+
+DEFINE_ERRORCODELIST_DATA
diff --git a/hostside/utils.c b/hostside/utils.c
index 8b128cd..3b5e307 100644
--- a/hostside/utils.c
+++ b/hostside/utils.c
@@ -11,12 +11,26 @@
 
 #include "common.h"
 
+static void vdie_vprintf(const char *fmt, va_list al) {
+  va_list al_copy;
+  va_copy(al_copy,al);
+  vfprintf(stderr,fmt,al_copy);
+  die_vprintf_hook(fmt,al);
+}
+
+static void vdie_printf(const char *fmt, ...) {
+  va_list al;
+  va_start(al,fmt);
+  vdie_vprintf(fmt,al);
+  va_end(al);
+}
+
 void vdie(const char *fmt, int ev, va_list al) {
+  vdie_printf("%s: fatal: ", progname);
+  vdie_vprintf(fmt,al);
+  if (ev) vdie_printf(": %s",strerror(ev));
+  vdie_printf("\n");
   die_hook();
-  fprintf(stderr, "%s: fatal: ", progname);
-  vfprintf(stderr,fmt,al);
-  if (ev) fprintf(stderr,": %s",strerror(ev));
-  fputc('\n',stderr);
   exit(12);
 }