summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-02-02 03:51:18 +0000
committerDavid Robillard <d@drobilla.net>2013-02-02 03:51:18 +0000
commit763255ad8fc731f298be99c5ebeb07791b748ed2 (patch)
treeb1d163c3a7e1fb7b6b6a274aae040670485ee1bb /src/server
parentd049b582e1db60ee0f6fd02a40202145488c7288 (diff)
downloadingen-763255ad8fc731f298be99c5ebeb07791b748ed2.tar.gz
ingen-763255ad8fc731f298be99c5ebeb07791b748ed2.tar.bz2
ingen-763255ad8fc731f298be99c5ebeb07791b748ed2.zip
Divorce monitor rate from block size, send updates at 10Hz.
Also add a simple attempt at staggering notification times to balance the buffer load and avoid massive spikes of all ports sending notifications at the same time. This should be quite a bit more sane when running at low latency. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5017 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/BlockImpl.cpp13
-rw-r--r--src/server/PortImpl.cpp82
-rw-r--r--src/server/PortImpl.hpp6
3 files changed, 79 insertions, 22 deletions
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index 072b4049..76831436 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -84,9 +84,7 @@ BlockImpl::activate(BufferFactory& bufs)
_activated = true;
for (uint32_t p = 0; p < num_ports(); ++p) {
PortImpl* const port = _ports->at(p);
- port->setup_buffers(bufs, port->poly(), false);
- port->connect_buffers();
- port->clear_buffers();
+ port->activate(bufs);
}
}
@@ -94,12 +92,9 @@ void
BlockImpl::deactivate()
{
_activated = false;
- for (uint32_t i = 0; i < _polyphony; ++i) {
- for (uint32_t j = 0; j < num_ports(); ++j) {
- PortImpl* const port = _ports->at(j);
- if (port->is_output() && port->buffer(i))
- port->buffer(i)->clear();
- }
+ for (uint32_t p = 0; p < num_ports(); ++p) {
+ PortImpl* const port = _ports->at(p);
+ port->deactivate();
}
}
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 352c8b23..59d28f15 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -23,6 +23,7 @@
#include "Buffer.hpp"
#include "BufferFactory.hpp"
#include "Engine.hpp"
+#include "Driver.hpp"
#include "PortImpl.hpp"
#include "PortType.hpp"
#include "ThreadManager.hpp"
@@ -32,6 +33,16 @@ using namespace std;
namespace Ingen {
namespace Server {
+static const uint32_t monitor_rate = 10.0; // Hz
+
+/** The length of time between monitor updates in frames */
+static inline uint32_t
+monitor_period(const Engine& engine)
+{
+ return std::max(engine.driver()->block_length(),
+ engine.driver()->sample_rate() / monitor_rate);
+}
+
PortImpl::PortImpl(BufferFactory& bufs,
BlockImpl* const block,
const Raul::Symbol& name,
@@ -46,12 +57,13 @@ PortImpl::PortImpl(BufferFactory& bufs,
, _index(index)
, _poly(poly)
, _buffer_size(buffer_size)
+ , _frames_since_monitor(0)
+ , _last_monitor_value(0.0f)
, _type(type)
, _buffer_type(buffer_type)
, _value(value)
, _min(bufs.forge().make(0.0f))
, _max(bufs.forge().make(1.0f))
- , _last_monitor_value(value)
, _set_states(new Raul::Array<SetState>(static_cast<size_t>(poly)))
, _prepared_set_states(NULL)
, _buffers(new Raul::Array<BufferRef>(static_cast<size_t>(poly)))
@@ -122,6 +134,36 @@ PortImpl::supports(const Raul::URI& value_type) const
_bufs.forge().alloc_uri(value_type));
}
+void
+PortImpl::activate(BufferFactory& bufs)
+{
+ setup_buffers(bufs, _poly, false);
+ connect_buffers();
+ clear_buffers();
+
+ /* Set the time since the last monitor update to a random value within the
+ monitor period, to spread the load out over time. Otherwise, every
+ port would try to send an update at exactly the same time, every time.
+ */
+ const double srate = bufs.engine().driver()->sample_rate();
+ const uint32_t period = srate / monitor_rate;
+ _frames_since_monitor = rand() % period;
+ _last_monitor_value = 0.0f;
+}
+
+void
+PortImpl::deactivate()
+{
+ if (is_output()) {
+ for (uint32_t v = 0; v < _poly; ++v) {
+ if (_buffers->at(v)) {
+ _buffers->at(v)->clear();
+ }
+ }
+ }
+ _last_monitor_value = 0.0f;
+}
+
Raul::Array<BufferRef>*
PortImpl::set_buffers(ProcessContext& context, Raul::Array<BufferRef>* buffers)
{
@@ -346,19 +388,20 @@ PortImpl::monitor(Context& context)
Forge& forge = context.engine().world()->forge();
URIs& uris = context.engine().world()->uris();
- LV2_URID key = 0;
- Raul::Atom val;
+
+ LV2_URID key = 0;
+ float val = 0.0f;
switch (_type.id()) {
case PortType::UNKNOWN:
break;
case PortType::AUDIO:
key = uris.ingen_activity;
- val = forge.make(buffer(0)->peak(context));
+ val = std::max(_last_monitor_value, buffer(0)->peak(context));
break;
case PortType::CONTROL:
case PortType::CV:
key = uris.ingen_value;
- val = forge.make(buffer(0)->value_at(0));
+ val = buffer(0)->value_at(0);
break;
case PortType::ATOM:
if (_buffer_type == _bufs.uris().atom_Sequence) {
@@ -384,18 +427,33 @@ PortImpl::monitor(Context& context)
&one);
}
}
- break;
}
- if (val.is_valid() && val != _last_monitor_value) {
+ const uint32_t period = monitor_period(context.engine());
+ if (key && val != _last_monitor_value && _frames_since_monitor >= period) {
+ // Time to send an update
if (context.notify(key, context.start(), this,
- val.size(), val.type(), val.get_body())) {
- _last_monitor_value = val;
- }
+ sizeof(float), forge.Float, &val)) {
+ // Success, update last value
+ switch (_type.id()) {
+ case PortType::AUDIO:
+ _last_monitor_value = 0.0f; // Reset peak
+ break;
+ case PortType::CONTROL:
+ case PortType::CV:
+ _last_monitor_value = val; // Store last sent control value
+ default:
+ break;
+ }
- /* On failure, last_broadcasted_value remains unaffected, so we'll try
- again next cycle and so on until the value is finally delivered. */
+ /* Update frames since last update to conceptually zero, but keep
+ the remainder to preserve load balancing. */
+ _frames_since_monitor = _frames_since_monitor % period;
+ }
+ // Otherwise failure, leave old value and try again next time
}
+
+ _frames_since_monitor += context.nframes();
}
} // namespace Server
diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp
index 45918964..2789c4f0 100644
--- a/src/server/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -119,6 +119,9 @@ public:
get_buffers(bufs, _buffers, poly, real_time);
}
+ void activate(BufferFactory& bufs);
+ void deactivate();
+
virtual void connect_buffers();
virtual void recycle_buffers();
@@ -202,12 +205,13 @@ protected:
uint32_t _index;
uint32_t _poly;
uint32_t _buffer_size;
+ uint32_t _frames_since_monitor;
+ float _last_monitor_value;
PortType _type;
LV2_URID _buffer_type;
Raul::Atom _value;
Raul::Atom _min;
Raul::Atom _max;
- Raul::Atom _last_monitor_value;
Raul::Array<SetState>* _set_states;
Raul::Array<SetState>* _prepared_set_states;
Raul::Array<BufferRef>* _buffers;