reset_thread_list ();
- Config->ParameterChanged.connect_same_thread (processor_usage_connection, boost::bind (&Graph::parameter_changed, this, _1));
-
#ifdef DEBUG_RT_ALLOC
graph = this;
pbd_alloc_allowed = &::alloc_allowed;
#endif
}
-void
-Graph::parameter_changed (std::string param)
-{
- if (param == X_("processor-usage")) {
- reset_thread_list ();
- }
-}
-
/** Set up threads for running the graph */
void
Graph::reset_thread_list ()
{
uint32_t num_threads = how_many_dsp_threads ();
+ /* For now, we shouldn't be using the graph code if we only have 1 DSP thread */
+ assert (num_threads > 1);
+
/* don't bother doing anything here if we already have the right
number of threads.
*/
- if (_thread_list.size() == num_threads) {
+ if (AudioEngine::instance()->process_thread_count() == num_threads) {
return;
}
- Glib::Mutex::Lock lm (_session.engine().process_lock());
- pthread_t a_thread;
+ Glib::Threads::Mutex::Lock lm (_session.engine().process_lock());
- if (!_thread_list.empty()) {
+ if (AudioEngine::instance()->process_thread_count() != 0) {
drop_threads ();
}
-#if 0
- /* XXX this only makes sense when we can use just the AudioEngine thread
- and still keep the graph current with the route list
- */
- if (num_threads <= 1) {
- /* no point creating 1 thread - the AudioEngine already gives us one
- */
- return;
- }
-#endif
- if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::main_thread, this), &a_thread, 100000) == 0) {
- _thread_list.push_back (a_thread);
+ if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::main_thread, this)) != 0) {
+ throw failed_constructor ();
}
for (uint32_t i = 1; i < num_threads; ++i) {
- if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::helper_thread, this), &a_thread, 100000) == 0) {
- _thread_list.push_back (a_thread);
+ if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::helper_thread, this))) {
+ throw failed_constructor ();
}
}
}
{
_quit_threads = true;
- for (unsigned int i=0; i< _thread_list.size(); i++) {
+ uint32_t thread_count = AudioEngine::instance()->process_thread_count ();
+
+ for (unsigned int i=0; i < thread_count; i++) {
_execution_sem.signal ();
}
_callback_start_sem.signal ();
- for (list<pthread_t>::iterator i = _thread_list.begin(); i != _thread_list.end(); ++i) {
- void* status;
- pthread_join (*i, &status);
- }
-
- _thread_list.clear ();
+ AudioEngine::instance()->join_process_threads ();
_execution_tokens = 0;
void
Graph::clear_other_chain ()
{
- Glib::Mutex::Lock ls (_swap_mutex);
+ Glib::Threads::Mutex::Lock ls (_swap_mutex);
while (1) {
if (_setup_chain != _pending_chain) {
_finished_refcount = _init_finished_refcount[chain];
/* Trigger the initial nodes for processing, which are the ones at the `input' end */
+ pthread_mutex_lock (&_trigger_mutex);
for (i=_init_trigger_list[chain].begin(); i!=_init_trigger_list[chain].end(); i++) {
- this->trigger( i->get() );
+ /* don't use ::trigger here, as we have already locked the mutex */
+ _trigger_queue.push_back (i->get ());
}
+ pthread_mutex_unlock (&_trigger_mutex);
}
void
Graph::trigger (GraphNode* n)
{
- pthread_mutex_lock (&_trigger_mutex);
+ pthread_mutex_lock (&_trigger_mutex);
_trigger_queue.push_back (n);
- pthread_mutex_unlock (&_trigger_mutex);
+ pthread_mutex_unlock (&_trigger_mutex);
}
/** Called when a node at the `output' end of the chain (ie one that has no-one to feed)
void
Graph::dec_ref()
{
- if (g_atomic_int_dec_and_test (&_finished_refcount)) {
+ if (g_atomic_int_dec_and_test (const_cast<gint*> (&_finished_refcount))) {
/* We have run all the nodes that are at the `output' end of
the graph, so there is nothing more to do this time around.
*/
- this->restart_cycle();
+ restart_cycle ();
}
}
return;
}
- this->prep();
+ prep ();
if (_graph_empty) {
goto again;
// starting with waking up the others.
}
-static bool
-is_feedback (boost::shared_ptr<RouteList> routelist, Route* from, boost::shared_ptr<Route> to)
-{
- for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
- if ((*ri).get() == from)
- return false;
- if ((*ri) == to)
- return true;
- }
- assert(0);
- return false;
-}
-
-static bool
-is_feedback (boost::shared_ptr<RouteList> routelist, boost::shared_ptr<Route> from, Route* to)
-{
- for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
- if ((*ri).get() == to)
- return true;
- if ((*ri) == from)
- return false;
- }
- assert(0);
- return false;
-}
+/** Rechain our stuff using a list of routes (which can be in any order) and
+ * a directed graph of their interconnections, which is guaranteed to be
+ * acyclic.
+ */
void
-Graph::rechain (boost::shared_ptr<RouteList> routelist)
+Graph::rechain (boost::shared_ptr<RouteList> routelist, GraphEdges const & edges)
{
- node_list_t::iterator ni;
- Glib::Mutex::Lock ls (_swap_mutex);
+ Glib::Threads::Mutex::Lock ls (_swap_mutex);
int chain = _setup_chain;
DEBUG_TRACE (DEBUG::Graph, string_compose ("============== setup %1\n", chain));
- // set all refcounts to 0;
/* This will become the number of nodes that do not feed any other node;
once we have processed this number of those nodes, we have finished.
/* Clear things out, and make _nodes_rt[chain] a copy of routelist */
for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
- node_ptr_t n = boost::dynamic_pointer_cast<GraphNode> (*ri);
-
- n->_init_refcount[chain] = 0;
- n->_activation_set[chain].clear();
- _nodes_rt[chain].push_back(n);
+ (*ri)->_init_refcount[chain] = 0;
+ (*ri)->_activation_set[chain].clear();
+ _nodes_rt[chain].push_back (*ri);
}
// now add refs for the connections.
- for (ni=_nodes_rt[chain].begin(); ni!=_nodes_rt[chain].end(); ni++) {
+ for (node_list_t::iterator ni = _nodes_rt[chain].begin(); ni != _nodes_rt[chain].end(); ni++) {
- /* We will set this to true if the node *ni is directly or
- indirectly fed by anything (without feedback)
- */
- bool has_input = false;
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (*ni);
- /* We will set this to true if the node *ni directly feeds
- anything (without feedback)
- */
- bool has_output = false;
+ /* The routes that are directly fed by r */
+ set<GraphVertex> fed_from_r = edges.from (r);
- /* We will also set up *ni's _activation_set to contain any nodes
- that it directly feeds.
- */
+ /* Hence whether r has an output */
+ bool const has_output = !fed_from_r.empty ();
- boost::shared_ptr<Route> rp = boost::dynamic_pointer_cast<Route>( *ni);
-
- for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
- if (rp->direct_feeds (*ri)) {
- if (is_feedback (routelist, rp.get(), *ri)) {
- continue;
- }
-
- has_output = true;
- (*ni)->_activation_set[chain].insert (boost::dynamic_pointer_cast<GraphNode> (*ri) );
- }
- }
+ /* Set up r's activation set */
+ for (set<GraphVertex>::iterator i = fed_from_r.begin(); i != fed_from_r.end(); ++i) {
+ r->_activation_set[chain].insert (*i);
+ }
- for (Route::FedBy::iterator fi=rp->fed_by().begin(); fi!=rp->fed_by().end(); fi++) {
- if (boost::shared_ptr<Route> r = fi->r.lock()) {
- if (!is_feedback (routelist, r, rp.get())) {
- has_input = true;
- }
- }
- }
+ /* r has an input if there are some incoming edges to r in the graph */
+ bool const has_input = !edges.has_none_to (r);
/* Increment the refcount of any route that we directly feed */
- for (node_set_t::iterator ai=(*ni)->_activation_set[chain].begin(); ai!=(*ni)->_activation_set[chain].end(); ai++) {
+ for (node_set_t::iterator ai = r->_activation_set[chain].begin(); ai != r->_activation_set[chain].end(); ai++) {
(*ai)->_init_refcount[chain] += 1;
}
- if (!has_input)
+ if (!has_input) {
+ /* no input, so this node needs to be triggered initially to get things going */
_init_trigger_list[chain].push_back (*ni);
+ }
- if (!has_output)
+ if (!has_output) {
+ /* no output, so this is one of the nodes that we can count off to decide
+ if we've finished
+ */
_init_finished_refcount[chain] += 1;
+ }
}
_pending_chain = chain;
return false;
}
-static void get_rt()
-{
- if (!jack_is_realtime (AudioEngine::instance()->jack())) {
- return;
- }
-
- int priority = jack_client_real_time_priority (AudioEngine::instance()->jack());
-
- if (priority) {
- struct sched_param rtparam;
-
- memset (&rtparam, 0, sizeof (rtparam));
- rtparam.sched_priority = priority;
-
- pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam);
- }
-}
-
void
Graph::helper_thread()
{
resume_rt_malloc_checks ();
pt->get_buffers();
- get_rt();
while(1) {
if (run_one()) {
resume_rt_malloc_checks ();
pt->get_buffers();
- get_rt();
again:
_callback_start_sem.wait ();
return;
}
- this->prep();
+ prep ();
if (_graph_empty && !_quit_threads) {
_callback_done_sem.signal ();
bool
Graph::in_process_thread () const
{
- list<pthread_t>::const_iterator i = _thread_list.begin ();
- while (i != _thread_list.end() && *i != pthread_self ()) {
- ++i;
- }
-
- return i != _thread_list.end ();
+ return AudioEngine::instance()->in_process_thread ();
}
projects / ardour.git / blobdiff