From d12148cfba0f807bfd39a2df4a1cd80e13a5d68d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 8 Jan 2019 11:56:44 +0100 Subject: [PATCH] graph: remove scheduler2 Move graph code into graph.h --- pipewire-pulseaudio | 2 +- spa/include/spa/graph/graph-scheduler2.h | 96 ------------------------ spa/include/spa/graph/graph.h | 73 ++++++++++-------- spa/tests/test-bluez5.c | 4 - spa/tests/test-control.c | 4 - spa/tests/test-graph.c | 4 - spa/tests/test-graph2.c | 1 - spa/tests/test-mixer.c | 4 - spa/tests/test-perf.c | 4 - src/pipewire/node.c | 10 --- 10 files changed, 44 insertions(+), 158 deletions(-) delete mode 100644 spa/include/spa/graph/graph-scheduler2.h diff --git a/pipewire-pulseaudio b/pipewire-pulseaudio index bebfcf019..ac4ad7c8f 160000 --- a/pipewire-pulseaudio +++ b/pipewire-pulseaudio @@ -1 +1 @@ -Subproject commit bebfcf0190c507103d998744fdddd9eac624d526 +Subproject commit ac4ad7c8f1e36e178b7d4a230b50fd5aafba5524 diff --git a/spa/include/spa/graph/graph-scheduler2.h b/spa/include/spa/graph/graph-scheduler2.h deleted file mode 100644 index 1cb7712bd..000000000 --- a/spa/include/spa/graph/graph-scheduler2.h +++ /dev/null @@ -1,96 +0,0 @@ -/* Simple Plugin API - * - * Copyright © 2018 Wim Taymans - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef __SPA_GRAPH_SCHEDULER_H__ -#define __SPA_GRAPH_SCHEDULER_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -struct spa_graph_data { - struct spa_graph *graph; -}; - -static inline void spa_graph_data_init(struct spa_graph_data *data, - struct spa_graph *graph) -{ - data->graph = graph; -} - -static inline int spa_graph_impl_run(void *data) -{ - struct spa_graph_data *d = (struct spa_graph_data *) data; - struct spa_graph *g = d->graph; - struct spa_graph_node *n, *tmp; - struct spa_list pending; - - spa_debug("graph %p run", d->graph); - spa_graph_state_reset(g->state); - - spa_list_init(&pending); - - spa_list_for_each(n, &g->nodes, link) { - struct spa_graph_state *s = n->state; - - spa_graph_state_reset(s); - - spa_debug("graph %p node %p: state %p add %d status %d", g, n, - s, s->pending, s->status); - - if (s->pending == 0) - spa_list_append(&pending, &n->sched_link); - } - spa_list_for_each_safe(n, tmp, &pending, sched_link) - spa_graph_node_process(n); - - return 0; -} - -static inline int spa_graph_impl_finish(void *data) -{ - struct spa_graph_data *d = (struct spa_graph_data *) data; - struct spa_graph *g = d->graph; - - spa_debug("graph %p finish", d->graph); - - if (g->parent) - spa_graph_node_trigger(g->parent); - - return 0; -} - -static const struct spa_graph_callbacks spa_graph_impl_default = { - SPA_VERSION_GRAPH_CALLBACKS, - .run = spa_graph_impl_run, - .finish = spa_graph_impl_finish, -}; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPA_GRAPH_SCHEDULER_H__ */ diff --git a/spa/include/spa/graph/graph.h b/spa/include/spa/graph/graph.h index 196c15e40..dbcb191aa 100644 --- a/spa/include/spa/graph/graph.h +++ b/spa/include/spa/graph/graph.h @@ -75,24 +75,11 @@ static inline int spa_graph_link_trigger(struct spa_graph_link *link) return state->status; } - -struct spa_graph_callbacks { -#define SPA_VERSION_GRAPH_CALLBACKS 0 - uint32_t version; - - int (*run) (void *data); - int (*finish) (void *data); -}; -#define spa_graph_run(g) ((g)->callbacks->run((g)->callbacks_data)) -#define spa_graph_finish(g) ((g)->callbacks->finish((g)->callbacks_data)) - struct spa_graph { uint32_t flags; /* flags */ struct spa_graph_node *parent; /* parent node or NULL when driver */ struct spa_graph_state *state; /* state of graph */ struct spa_list nodes; /* list of nodes of this graph */ - const struct spa_graph_callbacks *callbacks; - void *callbacks_data; }; struct spa_graph_node_callbacks { @@ -130,6 +117,49 @@ struct spa_graph_port { struct spa_graph_port *peer; /**< peer */ }; +static inline int spa_graph_run(struct spa_graph *graph) +{ + struct spa_graph_node *n, *tmp; + struct spa_list pending; + + spa_debug("graph %p run", graph); + spa_graph_state_reset(graph->state); + + spa_list_init(&pending); + + spa_list_for_each(n, &graph->nodes, link) { + struct spa_graph_state *s = n->state; + + spa_graph_state_reset(s); + + spa_debug("graph %p node %p: state %p add %d status %d", graph, n, + s, s->pending, s->status); + + if (s->pending == 0) + spa_list_append(&pending, &n->sched_link); + } + spa_list_for_each_safe(n, tmp, &pending, sched_link) + spa_graph_node_process(n); + + return 0; +} + +static inline int spa_graph_node_trigger(struct spa_graph_node *node) +{ + struct spa_graph_link *l, *t; + spa_debug("node %p trigger", node); + spa_list_for_each_safe(l, t, &node->links, link) + spa_graph_link_trigger(l); + return 0; +} + +static inline int spa_graph_finish(struct spa_graph *graph) +{ + spa_debug("graph %p finish", graph); + if (graph->parent) + spa_graph_node_trigger(graph->parent); + return 0; +} static inline int spa_graph_link_signal_node(void *data) { struct spa_graph_node *node = (struct spa_graph_node *)data; @@ -153,15 +183,6 @@ static inline void spa_graph_init(struct spa_graph *graph, struct spa_graph_stat spa_debug("graph %p init state %p", graph, state); } -static inline void -spa_graph_set_callbacks(struct spa_graph *graph, - const struct spa_graph_callbacks *callbacks, - void *data) -{ - graph->callbacks = callbacks; - graph->callbacks_data = data; -} - static inline void spa_graph_link_add(struct spa_graph_node *out, struct spa_graph_state *state, @@ -196,14 +217,6 @@ spa_graph_node_init(struct spa_graph_node *node, struct spa_graph_state *state) spa_debug("node %p init state %p", node, state); } -static inline int spa_graph_node_trigger(struct spa_graph_node *node) -{ - struct spa_graph_link *l, *t; - spa_debug("node %p trigger", node); - spa_list_for_each_safe(l, t, &node->links, link) - spa_graph_link_trigger(l); - return 0; -} static inline int spa_graph_node_impl_sub_process(void *data, struct spa_graph_node *node) { diff --git a/spa/tests/test-bluez5.c b/spa/tests/test-bluez5.c index adb80eb92..89d065edc 100644 --- a/spa/tests/test-bluez5.c +++ b/spa/tests/test-bluez5.c @@ -50,7 +50,6 @@ static struct spa_log *logger; #define spa_debug(f,...) spa_log_trace(logger, f, __VA_ARGS__) #include -#include #include #include @@ -80,7 +79,6 @@ struct data { struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct spa_graph_node source_node; struct spa_graph_port source_out; struct spa_graph_port sink_in; @@ -252,8 +250,6 @@ int main(int argc, char *argv[]) data.monitor = iface; spa_graph_init(&data.graph, &data.graph_state); - spa_graph_data_init(&data.graph_data, &data.graph); - spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data); spa_monitor_set_callbacks(data.monitor, &monitor_callbacks, &data); diff --git a/spa/tests/test-control.c b/spa/tests/test-control.c index 02f8baf51..0c8cc8e80 100644 --- a/spa/tests/test-control.c +++ b/spa/tests/test-control.c @@ -49,7 +49,6 @@ static SPA_LOG_IMPL(default_log); #define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__) #include -#include #include @@ -70,7 +69,6 @@ struct data { struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct spa_graph_node source_node; struct spa_graph_state source_state; struct spa_graph_port source_out; @@ -517,8 +515,6 @@ int main(int argc, char *argv[]) const char *str; spa_graph_init(&data.graph, &data.graph_state); - spa_graph_data_init(&data.graph_data, &data.graph); - spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data); data.log = &default_log.log; data.data_loop.version = SPA_VERSION_LOOP; diff --git a/spa/tests/test-graph.c b/spa/tests/test-graph.c index 7eb0cc7d6..d6154f4c5 100644 --- a/spa/tests/test-graph.c +++ b/spa/tests/test-graph.c @@ -44,7 +44,6 @@ static SPA_LOG_IMPL(default_log); #define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__) #include -#include #include #include @@ -66,7 +65,6 @@ struct data { struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct spa_graph_node source_node; struct spa_graph_state source_state; struct spa_graph_port source_out; @@ -515,8 +513,6 @@ int main(int argc, char *argv[]) const char *str; spa_graph_init(&data.graph, &data.graph_state); - spa_graph_data_init(&data.graph_data, &data.graph); - spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data); data.log = &default_log.log; data.data_loop.version = SPA_VERSION_LOOP; diff --git a/spa/tests/test-graph2.c b/spa/tests/test-graph2.c index b37cf7e52..2deffd4ba 100644 --- a/spa/tests/test-graph2.c +++ b/spa/tests/test-graph2.c @@ -38,7 +38,6 @@ #include #include #include -#include static SPA_LOG_IMPL(default_log); diff --git a/spa/tests/test-mixer.c b/spa/tests/test-mixer.c index 14db6d018..96897c84c 100644 --- a/spa/tests/test-mixer.c +++ b/spa/tests/test-mixer.c @@ -51,7 +51,6 @@ static SPA_LOG_IMPL(default_log); #define spa_debug(...) spa_log_trace(&default_log.log,__VA_ARGS__) #include -#include struct buffer { struct spa_buffer buffer; @@ -70,7 +69,6 @@ struct data { struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct spa_graph_node source1_node; struct spa_graph_state source1_state; struct spa_graph_port source1_out; @@ -674,8 +672,6 @@ int main(int argc, char *argv[]) data.data_loop.invoke = do_invoke; spa_graph_init(&data.graph, &data.graph_state); - spa_graph_data_init(&data.graph_data, &data.graph); - spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data); if ((str = getenv("SPA_DEBUG"))) data.log->level = atoi(str); diff --git a/spa/tests/test-perf.c b/spa/tests/test-perf.c index faa6d65ea..0fcbe58bf 100644 --- a/spa/tests/test-perf.c +++ b/spa/tests/test-perf.c @@ -39,7 +39,6 @@ #include #include #include -#include #define MODE_SYNC_PUSH (1<<0) #define MODE_SYNC_PULL (1<<1) @@ -71,7 +70,6 @@ struct data { struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct spa_graph_node source_node; struct spa_graph_state source_state; struct spa_graph_port source_out; @@ -507,8 +505,6 @@ int main(int argc, char *argv[]) const char *str; spa_graph_init(&data.graph, &data.graph_state); - spa_graph_data_init(&data.graph_data, &data.graph); - spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data); data.log = &default_log.log; data.data_loop.version = SPA_VERSION_LOOP; diff --git a/src/pipewire/node.c b/src/pipewire/node.c index 3d5fe0920..3a6d886b3 100644 --- a/src/pipewire/node.c +++ b/src/pipewire/node.c @@ -43,8 +43,6 @@ #define spa_debug pw_log_trace #endif -#include - #define DEFAULT_QUANTUM 1024u #define MIN_QUANTUM 64u @@ -57,11 +55,9 @@ struct impl { struct spa_graph driver_graph; struct spa_graph_state driver_state; - struct spa_graph_data driver_data; struct spa_graph graph; struct spa_graph_state graph_state; - struct spa_graph_data graph_data; struct pw_node_activation root_activation; struct pw_node_activation node_activation; @@ -693,18 +689,12 @@ struct pw_node *pw_node_new(struct pw_core *core, spa_graph_init(&impl->driver_graph, &impl->driver_state); - spa_graph_data_init(&impl->driver_data, &impl->driver_graph); - spa_graph_set_callbacks(&impl->driver_graph, - &spa_graph_impl_default, &impl->driver_data); this->rt.driver = &impl->driver_graph; this->rt.activation = &impl->root_activation; spa_graph_node_init(&this->rt.root, &this->rt.activation->state); spa_graph_init(&impl->graph, &impl->graph_state); - spa_graph_data_init(&impl->graph_data, &impl->graph); - spa_graph_set_callbacks(&impl->graph, - &spa_graph_impl_default, &impl->graph_data); spa_graph_node_set_subgraph(&this->rt.root, &impl->graph); spa_graph_node_set_callbacks(&this->rt.root,