realtime: actually ever regard anything as interfering (!)

diff --git a/hostside/TODO b/hostside/TODO
index 8f8f5884b883e34c4cf354ff836965e9bf71ee3a..be27a95852d1177117089bb902685515bdf5392c 100644 (file)
--- a/hostside/TODO
+++ b/hostside/TODO
@@ -1,3 +1,9 @@
+
+
+rsync -rvP bessar:/bessar/bessar/playground/+dump.2011-01-07T19-58-12+0000/. .
+      should tell bavarian to stop before it occupies A5 (before user
+      commanded it to stop)
+
 bugs
        at converging points eg X8, can we make train
                go from (say) X6 fast enough that when we stop

diff --git a/hostside/trackloc.c b/hostside/trackloc.c
index 6c8d59f0012adedfc7230234f96e630a59e0da28..eb54c785a06915a19ee31e230d44d8a7af3ef146 100644 (file)
--- a/hostside/trackloc.c
+++ b/hostside/trackloc.c
@@ -173,6 +173,9 @@ ErrorCode segment_interferer_does(TrackAdvanceContext *c, Segment *base,
   ec= interfering_movposcomb(c,inter, &does);  if (ec) return ec;
   if (!does) goto doesnt;
 
+  *does_r= 1;
+  return 0;
+
  doesnt:
   *does_r= 0;
   return 0;

diff --git a/hostside/x.gdb b/hostside/x.gdb
index 9df20e35fbc9dc1f4ddb1275187d4342230e74d1..3ecd3edd94a689370bab3467e4fd60bff7369f96 100644 (file)
--- a/hostside/x.gdb
+++ b/hostside/x.gdb
@@ -3,7 +3,11 @@ set args -S+realtime.log shinkansen.speeds.record santafe.speeds.record bavarian
 
 #break nose_nextseg if sevent_lno >= 35505
 
-break vdie
+#break predict
+
+#break fdet_nextseg if t->seg->i == &info_segments[4]
+break nose_nextseg if t->seg->i == &info_segments[4] && !u->optimistic
+
 break nmra_errchk_fail
 #break predict_problem
 break safety_panic