Improve ArduControl task scheduling

[r2c2.git] / source / libr2c2 / arducontrol.cpp

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 0065c4dd5c5f534ce170d50ace90b851fce5e612..40b3d35fd9f84693f233ad9490eb5013fa7bab57 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -296,6 +296,8 @@ void ArduControl::activate_accessory_by_mask(Accessory &acc, unsigned mask)
        unsigned bit = mask&~(mask-1);
        for(active_index=0; (bit>>active_index)>1; ++active_index) ;
        acc.state.set((acc.state&~bit)|(acc.target&bit));
+       if(debug>=1)
+               IO::print("Setting accessory %d bit %d, state=%d\n", acc.address, active_index, acc.state.pending);
        PendingCommand cmd(acc, Accessory::ACTIVATE, active_index);
        command_queue.push(cmd);
        active_accessory = &acc;
@@ -457,8 +459,9 @@ void ArduControl::tick()
 
        if(active_accessory && off_timeout)
        {
+               bool success = (monitor.get_peak()>0.35f && monitor.get_current()<monitor.get_peak()-0.2f);
                Time::TimeStamp t = Time::now();
-               if(t>off_timeout)
+               if(t>off_timeout || success)
                {
                        Accessory &acc = *active_accessory;
 
@@ -467,8 +470,10 @@ void ArduControl::tick()
                        // Assume success if we were uncertain of the physical setting
                        if(acc.uncertain&bit)
                                acc.uncertain &= ~bit;
-                       else if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
+                       else if(acc.kind==Accessory::TURNOUT && !success)
                        {
+                               if(debug>=1)
+                                       IO::print("Peak current only %.2f A\n", monitor.get_peak());
                                signal_turnout_failed.emit(acc.address);
                                acc.state.rollback();
                                if(acc.valid_states&(1<<(acc.target^bit)))
@@ -593,7 +598,7 @@ ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b, unsigned s):
        state(0),
        uncertain((1<<bits)-1),
        target(0),
-       active_time(500*Time::msec)
+       active_time((bits*700)*Time::msec)
 { }
 
 unsigned ArduControl::Accessory::create_state_command(unsigned b, bool c, char *buffer) const
@@ -697,7 +702,35 @@ bool ArduControl::Queue<T>::empty() const
 }
 
 
+bool ArduControl::CommandQueueTask::get_work(PendingCommand &cmd)
+{
+       return queue.pop(cmd);
+}
+
+void ArduControl::CommandQueueTask::push(const PendingCommand &cmd)
+{
+       queue.push(cmd);
+}
+
+
+ArduControl::Task::Task(const string &n, unsigned p):
+       name(n),
+       priority(p)
+{ }
+
+void ArduControl::Task::sleep(const Time::TimeDelta &dt)
+{
+       sleep_timeout = Time::now()+dt;
+}
+
+
+ArduControl::CommandQueueTask::CommandQueueTask():
+       Task("CommandQueue")
+{ }
+
+
 ArduControl::RefreshTask::RefreshTask():
+       Task("Refresh", 2),
        next(cycle.end()),
        round(0),
        loco(0),
@@ -791,19 +824,14 @@ void ArduControl::RefreshTask::advance()
 
 
 ArduControl::S88Task::S88Task(ArduControl &c):
+       Task("S88"),
        control(c),
        n_octets(0),
-       octets_remaining(0),
-       delay(0)
+       octets_remaining(0)
 { }
 
 bool ArduControl::S88Task::get_work(PendingCommand &cmd)
 {
-       if(delay)
-       {
-               --delay;
-               return false;
-       }
        if(octets_remaining || !n_octets)
                return false;
 
@@ -812,7 +840,7 @@ bool ArduControl::S88Task::get_work(PendingCommand &cmd)
        cmd.command[1] = octets_remaining;
        cmd.length = 2;
 
-       delay = 4;
+       sleep(100*Time::msec);
 
        return true;
 }
@@ -861,20 +889,18 @@ void ArduControl::S88Task::grow_n_octets(unsigned n)
 
 
 ArduControl::MfxAnnounceTask::MfxAnnounceTask():
+       Task("MfxAnnounce", 1),
        serial(0)
 { }
 
 bool ArduControl::MfxAnnounceTask::get_work(PendingCommand &cmd)
 {
-       Time::TimeStamp t = Time::now();
-       if(t<next)
-               return false;
-
        cmd.command[0] = MFX_ANNOUNCE;
        cmd.command[1] = serial>>8;
        cmd.command[2] = serial;
        cmd.length = 3;
-       next = t+400*Time::msec;
+
+       sleep(400*Time::msec);
 
        return true;
 }
@@ -886,6 +912,7 @@ void ArduControl::MfxAnnounceTask::set_serial(unsigned s)
 
 
 ArduControl::MfxSearchTask::MfxSearchTask(ArduControl &c):
+       Task("MfxSearch", 1),
        control(c),
        next_address(1),
        size(0),
@@ -925,17 +952,13 @@ bool ArduControl::MfxSearchTask::get_work(PendingCommand &cmd)
                return true;
        }
 
-       Time::TimeStamp t = Time::now();
-       if(t<next)
-               return false;
-
        cmd.command[0] = MFX_SEARCH;
        for(unsigned i=0; i<4; ++i)
                cmd.command[1+i] = bits>>(24-i*8);
        cmd.command[5] = size;
        cmd.length = 6;
 
-       next = t+200*Time::msec;
+       sleep(200*Time::msec);
 
        if(control.debug>=1)
                IO::print("Search %08X/%d\n", bits, size);
@@ -960,7 +983,7 @@ void ArduControl::MfxSearchTask::process_reply(const char *reply, unsigned lengt
                }
                else
                {
-                       next = Time::now()+2*Time::sec;
+                       sleep(2*Time::sec);
                        bits = 0;
                        size = 0;
                        misses = 0;
@@ -980,6 +1003,7 @@ bool ArduControl::MfxSearchTask::pop_info(MfxInfo &info)
 
 
 ArduControl::MonitorTask::MonitorTask():
+       Task("Monitor"),
        voltage(0),
        current(0),
        base_level(0),
@@ -989,17 +1013,13 @@ ArduControl::MonitorTask::MonitorTask():
 
 bool ArduControl::MonitorTask::get_work(PendingCommand &cmd)
 {
-       Time::TimeStamp t = Time::now();
-       if(t<next_poll)
-               return false;
-
        if(next_type==0)
                cmd.command[0] = READ_INPUT_VOLTAGE;
        else
                cmd.command[0] = READ_TRACK_CURRENT;
        cmd.length = 1;
 
-       next_poll = t+200*Time::msec;
+       sleep(200*Time::msec);
        next_type = (next_type+1)%5;
 
        return true;
@@ -1030,6 +1050,7 @@ ArduControl::ControlThread::ControlThread(ArduControl &c):
        control(c),
        done(false)
 {
+       tasks.push_back(&control.command_queue);
        tasks.push_back(&control.monitor);
        tasks.push_back(&control.mfx_announce);
        tasks.push_back(&control.mfx_search);
@@ -1151,12 +1172,33 @@ void ArduControl::ControlThread::init_baud_rate()
 
 bool ArduControl::ControlThread::get_work(PendingCommand &cmd)
 {
-       if(control.command_queue.pop(cmd))
-               return true;
+       Time::TimeStamp t = Time::now();
+
+       unsigned count = 0;
+       for(; (count<tasks.size() && tasks[count]->get_sleep_timeout()<=t); ++count) ;
+
+       for(; count>0; --count)
+       {
+               unsigned i = 0;
+               for(unsigned j=1; j<count; ++j)
+                       if(tasks[j]->get_priority()<tasks[i]->get_priority())
+                               i = j;
+
+               Task *task = tasks[i];
+               bool result = task->get_work(cmd);
 
-       for(vector<Task *>::iterator i=tasks.begin(); i!=tasks.end(); ++i)
-               if((*i)->get_work(cmd))
+               Time::TimeStamp st = max(task->get_sleep_timeout(), t);
+               for(; (i+1<tasks.size() && tasks[i+1]->get_sleep_timeout()<=st); ++i)
+                       tasks[i] = tasks[i+1];
+               tasks[i] = task;
+
+               if(result)
+               {
+                       if(control.debug>=2)
+                               IO::print("Scheduled task %s\n", task->get_name());
                        return true;
+               }
+       }
 
        // As fallback, send an idle packet for the MM protocol
        cmd.command[0] = MOTOROLA_SPEED;