using namespace std;
using namespace Msp;
+namespace {
+
+struct SetFlag
+{
+ bool &flag;
+
+ SetFlag(bool &f): flag(f) { flag = true; }
+ ~SetFlag() { flag = false; }
+};
+
+}
+
+
namespace Marklin {
Train::Train(Layout &l, const VehicleType &t, unsigned a):
loco_type(t),
address(a),
priority(0),
+ yielding_to(0),
pending_block(0),
+ reserving(false),
+ advancing(false),
controller(new AIControl(*this, new SimpleController)),
timetable(0),
active(false),
priority = p;
}
+void Train::yield_to(const Train &t)
+{
+ yielding_to = &t;
+}
+
void Train::add_vehicle(const VehicleType &vt)
{
Vehicle *veh = new Vehicle(layout, vt);
next_route = 0;
end_of_route = false;
- if(route)
+ if(route && !cur_blocks.empty())
{
BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back());
BlockRef next = last.next();
float Train::get_reserved_distance() const
{
+ if(cur_blocks.empty())
+ return 0;
+
Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
const VehicleType &vtype = veh.get_type();
float d = get_real_speed(current_speed)*(dt/Time::sec);
if(ok)
+ {
+ SetFlag setf(advancing);
vehicle.advance(reverse ? -d : d);
+ }
else if(accurate_position)
{
overshoot_dist += d;
j->block->traverse(j->entry, &block_len);
travel_dist += block_len;
- if(j->block->get_sensor_id()==addr)
+ if(j->block->get_sensor_id()==addr && !advancing)
{
const Block::Endpoint &bep = j->block->get_endpoints()[j->entry];
if(reverse)
}
}
- if(end!=cur_blocks.begin())
+ if(end!=cur_blocks.begin() && end!=cur_blocks.end())
// Free blocks up to the last inactive sensor
release_blocks(cur_blocks, cur_blocks.begin(), end);
}
unsigned pending_addr = pending_block->get_turnout_id();
bool double_addr = (*pending_block->get_tracks().begin())->get_type().is_double_address();
if(addr==pending_addr || (double_addr && addr==pending_addr+1))
- reserve_more();
+ {
+ if(reserving)
+ pending_block = 0;
+ else
+ reserve_more();
+ }
}
}
if(!active)
return 0;
- BlockRef *last = 0;
+ BlockRef *start = 0;
if(!rsv_blocks.empty())
- last = &rsv_blocks.back();
+ start = &rsv_blocks.back();
else if(!cur_blocks.empty())
- last = &cur_blocks.back();
- if(!last)
+ start = &cur_blocks.back();
+ if(!start)
return 0;
pending_block = 0;
const Route *cur_route = 0;
if(route)
{
- const set<Track *> &tracks = last->block->get_tracks();
+ const set<Track *> &tracks = start->block->get_tracks();
for(set<Track *>::const_iterator i=tracks.begin(); (cur_route!=route && i!=tracks.end()); ++i)
{
if(route->get_tracks().count(*i))
}
}
- bool got_more = false;
- BlockRef *good = last;
+ SetFlag setf(reserving);
+
+ BlockRef *last = start;
+ BlockRef *good = start;
unsigned good_sens = nsens;
- while(good_sens<3)
+ Train *blocking_train = 0;
+ std::list<BlockRef> contested_blocks;
+ while(good_sens<3 || !contested_blocks.empty())
{
// Traverse to the next block
- unsigned exit = last->block->traverse(last->entry);
+ unsigned exit = last->block->traverse(last->entry, cur_route);
Block *link = last->block->get_link(exit);
if(!link)
break;
else if(!cur_route->get_tracks().count(entry_ep.track))
{
// Keep the blocks if we arrived at the end of the route
- good = last;
- good_sens = nsens;
- end_of_route = true;
+ if(!blocking_train)
+ {
+ good = last;
+ good_sens = nsens;
+ end_of_route = true;
+ }
break;
}
}
if(link->get_endpoints().size()<2)
{
- good = last;
- good_sens = nsens;
+ if(!blocking_train)
+ {
+ good = last;
+ good_sens = nsens;
+ }
break;
}
+ if(blocking_train)
+ {
+ if(link->get_train()!=blocking_train)
+ {
+ // XXX is it possible that this won't free all the blocks we want?
+ if(blocking_train->free_block(*contested_blocks.back().block))
+ {
+ // Roll back and start actually reserving the blocks
+ last = &rsv_blocks.back();
+ if(blocking_train->get_priority()==priority)
+ blocking_train->yield_to(*this);
+ blocking_train = 0;
+ continue;
+ }
+ else
+ {
+ pending_block = contested_blocks.front().block;
+ break;
+ }
+ }
+ else
+ {
+ contested_blocks.push_back(BlockRef(link, entry));
+ last = &contested_blocks.back();
+ continue;
+ }
+ }
+
bool reserved = link->reserve(this);
if(!reserved)
{
- // Ask a lesser priority train to free the block for us
- if(link->get_train()->get_priority()<priority)
- if(link->get_train()->free_block(*link))
- reserved = link->reserve(this);
+ /* We've found another train. If it wants to exit the block from the
+ same endpoint we're trying to enter from or the other way around,
+ treat it as coming towards us. Otherwise treat it as going in the
+ same direction. */
+ Train *other_train = link->get_train();
+ int other_entry = other_train->get_entry_to_block(*link);
+ if(other_entry<0)
+ throw LogicError("Block reservation inconsistency");
+
+ int other_prio = other_train->get_priority();
+
+ bool entry_conflict = (static_cast<unsigned>(entry)==link->traverse(other_entry));
+ bool exit_conflict = (link->traverse(entry)==static_cast<unsigned>(other_entry));
+ if(!entry_conflict && !exit_conflict)
+ {
+ /* Same direction, keep the blocks we got so far and wait for the
+ other train to pass */
+ good = last;
+ good_sens = nsens;
+
+ // Ask a lesser priority train to free the block for us
+ if(other_train->get_priority()<priority)
+ if(other_train->free_block(*link))
+ reserved = link->reserve(this);
+ }
+ else if(other_prio<priority || (other_prio==priority && other_train!=yielding_to && entry_conflict))
+ {
+ /* A lesser priority train is coming at us, we must ask it to free
+ enough blocks to get clear of it to avoid a potential deadlock */
+ blocking_train = other_train;
+ contested_blocks.clear();
+ contested_blocks.push_back(BlockRef(link, entry));
+ last = &contested_blocks.back();
+ continue;
+ }
if(!reserved)
{
- // If we found another train and it's not headed straight for us, we can keep the blocks we got
- int other_entry = link->get_train()->get_entry_to_block(*link);
- if(other_entry<0)
- throw LogicError("Block reservation inconsistency");
- if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
- {
- good = last;
- good_sens = nsens;
- }
pending_block = link;
break;
}
if(path!=static_cast<int>(entry_ep.track->get_active_path()))
{
// The turnout is set to wrong path - switch and wait for it
- link->reserve(0);
pending_block = link;
entry_ep.track->set_active_path(path);
- break;
+ if(pending_block)
+ {
+ link->reserve(0);
+ break;
+ }
}
}
+ if(!contested_blocks.empty() && contested_blocks.front().block==link)
+ contested_blocks.pop_front();
+
rsv_blocks.push_back(BlockRef(link, entry));
last = &rsv_blocks.back();
if(last->block->get_sensor_id())
- {
++nsens;
- got_more = true;
- }
}
// Unreserve blocks that were not good
- while(!rsv_blocks.empty() && last!=good)
+ while(!rsv_blocks.empty() && &rsv_blocks.back()!=good)
{
- last->block->reserve(0);
+ rsv_blocks.back().block->reserve(0);
rsv_blocks.erase(--rsv_blocks.end());
- if(!rsv_blocks.empty())
- last = &rsv_blocks.back();
}
+ if(!rsv_blocks.empty() && &rsv_blocks.back()!=start)
+ // We got some new blocks, so no longer need to yield
+ yielding_to = 0;
+
// Make any sensorless blocks at the beginning immediately current
list<BlockRef>::iterator i;
for(i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !i->block->get_sensor_id()); ++i) ;
projects / r2c2.git / blobdiff