*/
#include <stdlib.h>
+#include <unistd.h>
#include "ardour/worker.h"
#include "pbd/error.h"
+#include <glibmm/timer.h>
+
namespace ARDOUR {
Worker::Worker(Workee* workee, uint32_t ring_size)
bool
Worker::schedule(uint32_t size, const void* data)
{
+ if (_requests->write_space() < size + sizeof(size)) {
+ return false;
+ }
if (_requests->write((const uint8_t*)&size, sizeof(size)) != sizeof(size)) {
return false;
}
if (_requests->write((const uint8_t*)data, size) != size) {
- return false; // FIXME: corruption
+ return false;
}
_sem.post();
return true;
bool
Worker::respond(uint32_t size, const void* data)
{
+ if (_requests->write_space() < size + sizeof(size)) {
+ return false;
+ }
if (_responses->write((const uint8_t*)&size, sizeof(size)) != sizeof(size)) {
return false;
}
if (_responses->write((const uint8_t*)data, size) != size) {
- return false; // FIXME: corruption
+ return false;
+ }
+ return true;
+}
+
+bool
+Worker::verify_message_completeness(RingBuffer<uint8_t>* rb)
+{
+ uint32_t read_space = rb->read_space();
+ 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 {
+ memcpy (&size, vec.buf[0], vec.len[0]);
+ memcpy (&size + vec.len[0], vec.buf[1], sizeof(size) - vec.len[0]);
+ }
+ if (read_space < size+sizeof(size)) {
+ /* message from writer is yet incomplete. respond next cycle */
+ return false;
}
return true;
}
{
uint32_t read_space = _responses->read_space();
uint32_t size = 0;
- while (read_space > sizeof(size)) {
+ while (read_space >= sizeof(size)) {
+ if (!verify_message_completeness(_responses)) {
+ /* message from writer is yet incomplete. respond next cycle */
+ return;
+ }
+ /* read and send response */
_responses->read((uint8_t*)&size, sizeof(size));
_responses->read(_response, size);
_workee->work_response(size, _response);
while (true) {
_sem.wait();
if (_exit) {
+ if (buf) free(buf);
return;
}
- uint32_t size = 0;
+ uint32_t size = _requests->read_space();
+ if (size < sizeof(size)) {
+ PBD::error << "Worker: no work-data on ring buffer" << endmsg;
+ continue;
+ }
+ while (!verify_message_completeness(_requests)) {
+ Glib::usleep(2000);
+ if (_exit) {
+ if (buf) free(buf);
+ return;
+ }
+ }
if (_requests->read((uint8_t*)&size, sizeof(size)) < sizeof(size)) {
PBD::error << "Worker: Error reading size from request ring"
<< endmsg;
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) {