X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Fblockallocator.cpp;h=429e19f31db95a3e4f827cc049079ad162ca6803;hb=8d13f6fea658c3c69cf235953c9a2f23de6a8814;hp=c9cc5b44440fe6987dff33fb0939cfbf4ca79363;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp index c9cc5b4..429e19f 100644 --- a/source/libr2c2/blockallocator.cpp +++ b/source/libr2c2/blockallocator.cpp @@ -1,9 +1,11 @@ #include #include #include "blockallocator.h" +#include "block.h" #include "catalogue.h" #include "driver.h" #include "layout.h" +#include "trackcircuit.h" #include "trackiter.h" #include "train.h" #include "vehicle.h" @@ -13,6 +15,16 @@ using namespace Msp; namespace R2C2 { +struct BlockAllocator::BlockMatch +{ + const Block █ + + BlockMatch(const Block &b): block(b) { } + + bool operator()(const BlockIter &bi) const { return &*bi==█ } +}; + + BlockAllocator::BlockAllocator(Train &t): train(t), cur_blocks_end(blocks.end()), @@ -22,9 +34,9 @@ BlockAllocator::BlockAllocator(Train &t): { Layout &layout = train.get_layout(); layout.signal_block_reserved.connect(sigc::mem_fun(this, &BlockAllocator::block_reserved)); - layout.signal_block_state_changed.connect(sigc::mem_fun(this, &BlockAllocator::block_state_changed)); + layout.signal_sensor_state_changed.connect(sigc::mem_fun(this, &BlockAllocator::sensor_state_changed)); - const set &tracks = layout.get_tracks(); + const set &tracks = layout.get_all(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) if((*i)->get_turnout_id()) (*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changed), sigc::ref(**i)))); @@ -35,19 +47,13 @@ void BlockAllocator::start_from(const BlockIter &block) if(!block) throw invalid_argument("BlockAllocator::start_from"); - release_blocks(blocks.begin(), blocks.end()); - - blocks.push_back(block); - if(!block->reserve(&train)) - { - blocks.pop_back(); - return; - } + clear(); + reserve_block(block); } void BlockAllocator::clear() { - release_blocks(blocks.begin(), blocks.end()); + release_blocks_begin(blocks.end()); pending_block = 0; stop_at_block = 0; } @@ -84,12 +90,22 @@ const BlockIter &BlockAllocator::last_current() const return *--i; } -int BlockAllocator::get_entry_to_block(const Block &block) const +const BlockIter &BlockAllocator::iter_for(const Block &block) const { - for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) - if(i->block()==&block) - return i->entry(); - return -1; + BlockList::const_iterator i = find_if(blocks.begin(), blocks.end(), IterBlockMatch(block)); + if(i==blocks.end()) + throw key_error(&block); + return *i; +} + +bool BlockAllocator::has_block(const Block &block) const +{ + return find_if(blocks.begin(), blocks.end(), IterBlockMatch(block))!=blocks.end(); +} + +bool BlockAllocator::is_block_current(const Block &block) const +{ + return find_if(blocks.begin(), cur_blocks_end, IterBlockMatch(block))!=cur_blocks_end; } void BlockAllocator::reserve_more() @@ -143,13 +159,8 @@ void BlockAllocator::reserve_more() break; } - blocks.push_back(block); - if(!block->reserve(&train)) - { - blocks.pop_back(); - pending_block = &*block; + if(!reserve_block(block)) break; - } if(cur_blocks_end==blocks.end()) --cur_blocks_end; @@ -199,15 +210,26 @@ void BlockAllocator::reserve_more() ++cur_blocks_end; } -void BlockAllocator::release_until(const Block &block) +bool BlockAllocator::reserve_block(const BlockIter &block) { - for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i) - if(i->block()==&block) + /* Add it to the list first to present a consistent state in block_reserved + signal. */ + blocks.push_back(block); + try + { + if(!block->reserve(&train)) { - if(++i!=cur_blocks_end) - release_blocks(blocks.begin(), i); - return; + blocks.pop_back(); + return false; } + + return true; + } + catch(...) + { + blocks.pop_back(); + throw; + } } bool BlockAllocator::release_from(const Block &block) @@ -218,7 +240,7 @@ bool BlockAllocator::release_from(const Block &block) if(i->block()==&block) { if(have_sensor) - release_blocks(i, blocks.end()); + release_blocks_end(i); return have_sensor; } else if((*i)->get_sensor_id()) @@ -230,22 +252,46 @@ bool BlockAllocator::release_from(const Block &block) void BlockAllocator::release_noncurrent() { - release_blocks(cur_blocks_end, blocks.end()); + release_blocks_end(cur_blocks_end); } -void BlockAllocator::release_blocks(const BlockList::iterator &b, const BlockList::iterator &e) +void BlockAllocator::release_blocks_begin(const BlockList::iterator &end) { - for(BlockList::iterator i=b; i!=e; ) - { - if(cur_blocks_end==i) - cur_blocks_end = e; + for(BlockList::iterator i=blocks.begin(); i!=end; ) + release_block(i++); +} + +void BlockAllocator::release_blocks_end(const BlockList::iterator &begin) +{ + // Guard against decrementing blocks.begin() + if(begin==blocks.begin()) + return release_blocks_begin(blocks.end()); + + if(begin==blocks.end()) + return; - Block &block = **i; - blocks.erase(i++); - block.reserve(0); + /* Release the blocks in reverse order so that a consistent state is + presented in block_reserved signal. */ + bool done = false; + for(BlockList::iterator i=--blocks.end(); !done; ) + { + done = (i==begin); + release_block(i--); } } +void BlockAllocator::release_block(const BlockList::iterator &i) +{ + if(i==cur_blocks_end) + ++cur_blocks_end; + if(&**i==pending_block) + pending_block = 0; + + Block &block = **i; + blocks.erase(i); + block.reserve(0); +} + void BlockAllocator::reverse() { release_noncurrent(); @@ -256,9 +302,8 @@ void BlockAllocator::reverse() void BlockAllocator::turnout_path_changed(Track &track) { - for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) - if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving && &**i==pending_block) - reserve_more(); + if(&track.get_block()==pending_block && !reserving) + reserve_more(); } void BlockAllocator::block_reserved(Block &block, const Train *tr) @@ -267,9 +312,18 @@ void BlockAllocator::block_reserved(Block &block, const Train *tr) reserve_more(); } -void BlockAllocator::block_state_changed(Block &block, Block::State state) +void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state) { - if(state==Block::MAYBE_ACTIVE) + Block *block = 0; + if(TrackCircuit *tc = dynamic_cast(&sensor)) + block = &tc->get_block(); + else + return; + + if(block->get_train()!=&train) + return; + + if(state==Sensor::MAYBE_ACTIVE) { // Find the first sensor block from our reserved blocks that isn't this sensor BlockList::iterator end; @@ -277,7 +331,7 @@ void BlockAllocator::block_state_changed(Block &block, Block::State state) for(end=cur_blocks_end; end!=blocks.end(); ++end) if((*end)->get_sensor_id()) { - if(&**end!=&block) + if(&**end!=block) { if(result==0) result = 2; @@ -300,31 +354,33 @@ void BlockAllocator::block_state_changed(Block &block, Block::State state) else if(result==3) train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order"); } - else if(state==Block::INACTIVE) + else if(state==Sensor::INACTIVE) { - const Vehicle &veh = train.get_controller().get_reverse() ? train.get_vehicle(0) : train.get_vehicle(train.get_n_vehicles()-1); + const Vehicle &veh = train.get_vehicle(train.get_controller().get_reverse() ? 0 : train.get_n_vehicles()-1); + const Block &veh_block = veh.get_track()->get_block(); + const Driver &driver = train.get_layout().get_driver(); - // Find the first sensor in our current blocks that's still active - BlockList::iterator end = blocks.begin(); + /* Sensors aren't guaranteed to be detriggered in order. Go through the + block list and locate the first sensor that's still active. */ + BlockList::iterator end = blocks.end(); for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i) { - if((*i)->has_track(*veh.get_track())) + // Avoid freeing blocks that still hold the train's vehicles + if(&**i==&veh_block) break; + if((*i)->get_sensor_id()) { - if(train.get_layout().get_driver().get_sensor((*i)->get_sensor_id())) + if(driver.get_sensor((*i)->get_sensor_id())) break; else - { end = i; - ++end; - } } } - if(end!=blocks.begin() && end!=cur_blocks_end) + if(end!=blocks.end()) // Free blocks up to the last inactive sensor - release_blocks(blocks.begin(), end); + release_blocks_begin(++end); } }