]> git.tdb.fi Git - r2c2.git/commit
Avoid nested block reservations completely
authorMikko Rasa <tdb@tdb.fi>
Wed, 8 Apr 2015 16:55:21 +0000 (19:55 +0300)
committerMikko Rasa <tdb@tdb.fi>
Wed, 8 Apr 2015 17:02:16 +0000 (20:02 +0300)
commitd0881a98a6240758ac1aeceaa9443d718ab1ad5c
tree1e39cf922068601f64f4b2b5054db6183c0e77d7
parentdfe3dd563981883f3b7c826102fed33c7ff0d12d
Avoid nested block reservations completely

The emission queue turned out to still be broken in some situations.
Rather than make the logic even more complex, I'll just delay the
reservation until we're no longer inside a signal emission.  For good
measure, the same is applied to turnout and sensor signals too.
source/libr2c2/blockallocator.cpp
source/libr2c2/blockallocator.h
source/libr2c2/layout.cpp
source/libr2c2/layout.h
source/libr2c2/train.cpp