mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

it still only iterates once, but we're getting there

Browse source 
Original commit message from CVS:
it still only iterates once, but we're getting there
This commit is contained in:
Andy Wingo 2002-02-11 07:45:30 +00:00
parent 8af369ecf6
commit e8b452e27c
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gst/schedulers/gststandardscheduler.c
View file

@ -88,7 +88,6 @@ struct _GstStandardScheduler {
GstStandardSchedulerState state; GstStandardSchedulerState state;
cothread *main; cothread *main;
cothread *current;
}; };
struct _GstStandardSchedulerClass { struct _GstStandardSchedulerClass {
@ -186,7 +185,7 @@ gst_standard_scheduler_init (GstStandardScheduler *scheduler)
scheduler->num_elements = 0; scheduler->num_elements = 0;
scheduler->chains = NULL; scheduler->chains = NULL;
scheduler->num_chains = 0; scheduler->num_chains = 0;
scheduler->current = scheduler->main = cothread_create (NULL, 0, NULL); scheduler->main = cothread_create (NULL, 0, NULL, NULL);
} }
static void static void
@ -222,13 +221,19 @@ GstPluginDesc plugin_desc = {
plugin_init plugin_init
}; };
static inline void sched_switch (GstStandardScheduler *sched, cothread *to) static inline void sched_switch (cothread *to)
{ {
cothread *from = sched->current; cothread *from = cothread_self ();
if (from == to) {
GST_DEBUG (GST_CAT_COTHREAD_SWITCH, "trying to switch to the same cothread (%p), not allowed\n",
to);
G_BREAKPOINT();
}
GST_INFO (GST_CAT_COTHREAD_SWITCH, "switching from cothread %p to cothread %p", GST_INFO (GST_CAT_COTHREAD_SWITCH, "switching from cothread %p to cothread %p",
sched->current, to); from, to);
sched->current = to;
cothread_switch (from, to); cothread_switch (from, to);
GST_INFO (GST_CAT_COTHREAD_SWITCH, "we're in cothread %p now", from);
} }
static int static int
@ -376,8 +381,7 @@ gst_standard_scheduler_chainhandler_proxy (GstPad * pad, GstBuffer * buf)
while (GST_RPAD_BUFPEN (GST_RPAD_PEER (pad)) != NULL && --loop_count) { while (GST_RPAD_BUFPEN (GST_RPAD_PEER (pad)) != NULL && --loop_count) {
GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p to empty bufpen %d\n", GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p to empty bufpen %d\n",
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)), loop_count); GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)), loop_count);
sched_switch (GST_PAD_STANDARD_SCHED (pad), sched_switch (GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
/* we may no longer be the same pad, check. */ /* we may no longer be the same pad, check. */
if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) { if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) {
@ -396,8 +400,7 @@ gst_standard_scheduler_chainhandler_proxy (GstPad * pad, GstBuffer * buf)
GST_RPAD_BUFPEN (GST_RPAD_PEER (pad)) = buf; GST_RPAD_BUFPEN (GST_RPAD_PEER (pad)) = buf;
GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p\n", GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p\n",
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad))); GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
sched_switch (GST_PAD_STANDARD_SCHED (pad), sched_switch (GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
GST_DEBUG (GST_CAT_DATAFLOW, "done switching\n"); GST_DEBUG (GST_CAT_DATAFLOW, "done switching\n");
} }
@ -416,8 +419,7 @@ gst_standard_scheduler_gethandler_proxy (GstPad * pad)
GST_DEBUG (GST_CAT_DATAFLOW, "switching to \"%s\": %p to fill bufpen\n", GST_DEBUG (GST_CAT_DATAFLOW, "switching to \"%s\": %p to fill bufpen\n",
GST_ELEMENT_NAME (GST_ELEMENT (GST_PAD_PARENT (pad))), GST_ELEMENT_NAME (GST_ELEMENT (GST_PAD_PARENT (pad))),
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad))); GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
sched_switch (GST_PAD_STANDARD_SCHED (pad), sched_switch (GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
/* we may no longer be the same pad, check. */ /* we may no longer be the same pad, check. */
if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) { if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) {
@ -452,8 +454,7 @@ gst_standard_scheduler_pullregionfunc_proxy (GstPad * pad, GstRegionType type, g
while (GST_RPAD_BUFPEN (pad) == NULL) { while (GST_RPAD_BUFPEN (pad) == NULL) {
GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p to fill bufpen\n", GST_DEBUG (GST_CAT_DATAFLOW, "switching to %p to fill bufpen\n",
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad))); GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
sched_switch (GST_PAD_STANDARD_SCHED (pad), sched_switch (GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
GST_ELEMENT_THREADSTATE (GST_PAD_PARENT (pad)));
/* we may no longer be the same pad, check. */ /* we may no longer be the same pad, check. */
if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) { if (GST_RPAD_PEER (peer) != (GstRealPad *) pad) {
@ -574,17 +575,21 @@ gst_standard_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain
/* need to set up the cothread now */ /* need to set up the cothread now */
if (wrapper_function != NULL) { if (wrapper_function != NULL) {
GST_ELEMENT_THREADSTATE (element) = cothread_create (wrapper_function, 1, (void **) element); if (!GST_ELEMENT_THREADSTATE (element)) {
if (GST_ELEMENT_THREADSTATE (element) == NULL) { GST_ELEMENT_THREADSTATE (element) = cothread_create (wrapper_function, 1, (void **) element, chain->sched->main);
gst_element_error (element, "could not create cothread for \"%s\"", if (GST_ELEMENT_THREADSTATE (element) == NULL) {
GST_ELEMENT_NAME (element), NULL); gst_element_error (element, "could not create cothread for \"%s\"",
return FALSE; GST_ELEMENT_NAME (element), NULL);
return FALSE;
}
GST_DEBUG (GST_CAT_SCHEDULING, "created cothread %p for '%s'\n",
GST_ELEMENT_THREADSTATE (element),
GST_ELEMENT_NAME (element));
} else {
cothread_reset (GST_ELEMENT_THREADSTATE (element), wrapper_function, 1, (void **) element, chain->sched->main);
GST_DEBUG (GST_CAT_SCHEDULING, "set wrapper function for '%s' to &%s\n",
GST_ELEMENT_NAME (element), GST_DEBUG_FUNCPTR_NAME (wrapper_function));
} }
GST_DEBUG (GST_CAT_SCHEDULING, "created cothread %p for '%s'\n",
GST_ELEMENT_THREADSTATE (element),
GST_ELEMENT_NAME (element));
GST_DEBUG (GST_CAT_SCHEDULING, "set wrapper function for '%s' to &%s\n",
GST_ELEMENT_NAME (element), GST_DEBUG_FUNCPTR_NAME (wrapper_function));
} }
} }
@ -1063,7 +1068,7 @@ static void
gst_standard_scheduler_yield (GstScheduler *sched, GstElement *element) gst_standard_scheduler_yield (GstScheduler *sched, GstElement *element)
{ {
if (GST_ELEMENT_IS_COTHREAD_STOPPING (element)) { if (GST_ELEMENT_IS_COTHREAD_STOPPING (element)) {
sched_switch ((GstStandardScheduler*) sched, ((GstStandardScheduler*) sched)->main); sched_switch (((GstStandardScheduler*) sched)->main);
} }
} }
@ -1071,7 +1076,7 @@ static gboolean
gst_standard_scheduler_interrupt (GstScheduler *sched, GstElement *element) gst_standard_scheduler_interrupt (GstScheduler *sched, GstElement *element)
{ {
GST_FLAG_SET (element, GST_ELEMENT_COTHREAD_STOPPING); GST_FLAG_SET (element, GST_ELEMENT_COTHREAD_STOPPING);
sched_switch ((GstStandardScheduler*) sched, ((GstStandardScheduler*) sched)->main); sched_switch (((GstStandardScheduler*) sched)->main);
return FALSE; return FALSE;
} }
@ -1090,7 +1095,7 @@ gst_standard_scheduler_error (GstScheduler *sched, GstElement *element)
GST_SCHEDULER_STATE (sched) = GST_SCHEDULER_STATE_ERROR; GST_SCHEDULER_STATE (sched) = GST_SCHEDULER_STATE_ERROR;
sched_switch ((GstStandardScheduler*) sched, ((GstStandardScheduler*) sched)->main); sched_switch (((GstStandardScheduler*) sched)->main);
} }
} }
@ -1220,7 +1225,7 @@ gst_standard_scheduler_iterate (GstScheduler * sched)
GST_DEBUG (GST_CAT_DATAFLOW, "set COTHREAD_STOPPING flag on \"%s\"(@%p)\n", GST_DEBUG (GST_CAT_DATAFLOW, "set COTHREAD_STOPPING flag on \"%s\"(@%p)\n",
GST_ELEMENT_NAME (entry), entry); GST_ELEMENT_NAME (entry), entry);
if (GST_ELEMENT_THREADSTATE (entry)) { if (GST_ELEMENT_THREADSTATE (entry)) {
sched_switch (GST_ELEMENT_STANDARD_SCHED (entry), GST_ELEMENT_THREADSTATE (entry)); sched_switch (GST_ELEMENT_THREADSTATE (entry));
/* if something changed, return - go on else */ /* if something changed, return - go on else */
if (GST_FLAG_IS_SET(bsched, GST_STANDARD_SCHEDULER_CHANGE)) if (GST_FLAG_IS_SET(bsched, GST_STANDARD_SCHEDULER_CHANGE))
return GST_SCHEDULER_STATE_RUNNING; return GST_SCHEDULER_STATE_RUNNING;