From 9b685d33634471664f9ef13e22dd0fba7ecf0d36 Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 4 May 2008 19:21:31 +0000 Subject: [PATCH] properly set ownership of nose during resolution --- hostside/resolve.c | 8 +++----- hostside/runes | 3 +++ hostside/xs.gdb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 hostside/runes diff --git a/hostside/resolve.c b/hostside/resolve.c index 2779867..4b0350d 100644 --- a/hostside/resolve.c +++ b/hostside/resolve.c @@ -388,11 +388,11 @@ static int findhead_nextseg(TrackLocation *t, struct TrackAdvanceContext *c, if (!t->seg->resfin_ours || t->seg->resfin_done) return -1; u->furthest= t->seg; - if (!t->seg->res_detect) { u->extraspace= 0; return -1; } - - u->train->foredetect= t->seg; t->seg->tr_backwards= t->backwards; t->seg->resfin_done= 1; + + if (!t->seg->res_detect) { u->extraspace= 0; return -1; } + u->train->foredetect= t->seg; return 0; } @@ -471,8 +471,6 @@ static int resolve_complete_ends_train(Train *tra) { } tra->uncertainty= tra->maxinto; - FOR_SEG seg->resfin_done= 0; - t.seg= tra->foredetect; t.remain= 0; t.backwards= !tra->foredetect->tr_backwards; diff --git a/hostside/runes b/hostside/runes new file mode 100644 index 0000000..408de55 --- /dev/null +++ b/hostside/runes @@ -0,0 +1,3 @@ +./realtime shinkansen.speeds.record homes.record +valgrind --db-attach=yes ./realtime -Lt -S+realtime.log shinkansen.speeds.record homes.record +diff -u +realtime.log t |less diff --git a/hostside/xs.gdb b/hostside/xs.gdb index e9564fd..76f606e 100644 --- a/hostside/xs.gdb +++ b/hostside/xs.gdb @@ -3,6 +3,6 @@ break vdie break nmra_errchk_fail break predict_problem break safety_panic -#break mgettimeofday +break findhead_nextseg set args -S+realtime.log shinkansen.speeds.record homes.record run -- 2.30.2