use ForGroup to flag and detect route-group based control changes

[ardour.git] / libs / ardour / worker.cc

diff --git a/libs/ardour/worker.cc b/libs/ardour/worker.cc
index d5238adb60e49377e95810c5b3e1451b28e688a6..ce71c92a1537f8f04330717d0b38601b3d5c649a 100644 (file)
--- a/libs/ardour/worker.cc
+++ b/libs/ardour/worker.cc
@@ -32,7 +32,7 @@ Worker::Worker(Workee* workee, uint32_t ring_size)
        , _requests(new RingBuffer<uint8_t>(ring_size))
        , _responses(new RingBuffer<uint8_t>(ring_size))
        , _response((uint8_t*)malloc(ring_size))
-       , _sem(0)
+       , _sem ("worker_semaphore", 0)
        , _exit(false)
        , _thread (Glib::Threads::Thread::create(sigc::mem_fun(*this, &Worker::run)))
 {}
@@ -40,7 +40,7 @@ Worker::Worker(Workee* workee, uint32_t ring_size)
 Worker::~Worker()
 {
        _exit = true;
-       _sem.post();
+       _sem.signal();
        _thread->join();
 }
 
@@ -56,7 +56,7 @@ Worker::schedule(uint32_t size, const void* data)
        if (_requests->write((const uint8_t*)data, size) != size) {
                return false;
        }
-       _sem.post();
+       _sem.signal();
        return true;
 }
 
@@ -82,6 +82,9 @@ Worker::verify_message_completeness(RingBuffer<uint8_t>* rb)
        uint32_t size;
        RingBuffer<uint8_t>::rw_vector vec;
        rb->get_read_vector (&vec);
+       if (vec.len[0] + vec.len[1] < sizeof(size)) {
+               return false;
+       }
        if (vec.len[0] >= sizeof(size)) {
                memcpy (&size, vec.buf[0], sizeof (size));
        } else {
@@ -121,6 +124,7 @@ Worker::run()
        while (true) {
                _sem.wait();
                if (_exit) {
+                       if (buf) free(buf);
                        return;
                }
 
@@ -132,6 +136,7 @@ Worker::run()
                while (!verify_message_completeness(_requests)) {
                        Glib::usleep(2000);
                        if (_exit) {
+                               if (buf) free(buf);
                                return;
                        }
                }
@@ -143,7 +148,13 @@ Worker::run()
 
                if (size > buf_size) {
                        buf = realloc(buf, size);
-                       buf_size = size;
+                       if (buf) {
+                               buf_size = size;
+                       } else {
+                               PBD::error << "Worker: Error allocating memory"
+                                          << endmsg;
+                               buf_size = 0; // TODO: This is probably fatal
+                       }
                }
 
                if (_requests->read((uint8_t*)buf, size) < size) {