- Wine-Devel - list.winehq.org

[PATCH] winegstreamer: Change blacklist to a more neutral word (try 2)
by André Hentschel June 19, 2020

June 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winegstreamer/gst_cbs.c | 16 ++++++++-------- dlls/winegstreamer/gst_cbs.h | 8 ++++---- dlls/winegstreamer/gstdemux.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..6959eb33a5a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -261,20 +261,20 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { - struct cb_data cbdata = { AUTOPLUG_BLACKLIST }; + struct cb_data cbdata = { AUTOPLUG_BANNED }; - cbdata.u.autoplug_blacklist_data.bin = bin; - cbdata.u.autoplug_blacklist_data.pad = pad; - cbdata.u.autoplug_blacklist_data.caps = caps; - cbdata.u.autoplug_blacklist_data.fact = fact; - cbdata.u.autoplug_blacklist_data.user = user; + cbdata.u.autoplug_banned_data.bin = bin; + cbdata.u.autoplug_banned_data.pad = pad; + cbdata.u.autoplug_banned_data.caps = caps; + cbdata.u.autoplug_banned_data.fact = fact; + cbdata.u.autoplug_banned_data.user = user; call_cb(&cbdata); - return cbdata.u.autoplug_blacklist_data.ret; + return cbdata.u.autoplug_banned_data.ret; } void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..5740a8e6e8f 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -40,7 +40,7 @@ enum CB_TYPE { EVENT_SINK, GOT_DATA_SINK, REMOVED_DECODED_PAD, - AUTOPLUG_BLACKLIST, + AUTOPLUG_BANNED, UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX @@ -108,14 +108,14 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct autoplug_blacklist_data { + struct autoplug_banned_data { GstElement *bin; GstPad *pad; GstCaps *caps; GstElementFactory *fact; gpointer user; GstAutoplugSelectResult ret; - } autoplug_blacklist_data; + } autoplug_banned_data; struct unknown_type_data { GstElement *bin; GstPad *pad; @@ -150,7 +150,7 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f82..8af0758ca02 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1232,12 +1232,12 @@ static void no_more_pads(GstElement *decodebin, gpointer user) SetEvent(filter->no_more_pads_event); } -static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) +static GstAutoplugSelectResult autoplug_banned(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + WARN("Banned a/52 decoder because it only works in Totem\n"); return GST_AUTOPLUG_SELECT_SKIP; } if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { @@ -1619,7 +1619,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_banned_wrapper), filter); g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); @@ -2276,10 +2276,10 @@ void perform_cb_gstdemux(struct cb_data *cbdata) removed_decoded_pad(data->element, data->pad, data->user); break; } - case AUTOPLUG_BLACKLIST: + case AUTOPLUG_BANNED: { - struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data; - cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin, + struct autoplug_banned_data *data = &cbdata->u.autoplug_banned_data; + cbdata->u.autoplug_banned_data.ret = autoplug_banned(data->bin, data->pad, data->caps, data->fact, data->user); break; } -- 2.17.1

1 0

[PATCH] ntdll: Increment num_busy_workers when queuing TP object.
by Paul Gofman June 19, 2020

June 19, 2020

Otherwise two consequative submits may have the same num_busy_workers value if threadpool_worker_proc did not have a chance to pick the work in between. A new thread is not created in tp_submit() for the second submit and if the first submit queues an (infinitely long) wait the next submitted callback is not called for indefinite time period. Fixes hang on exit in Detroit Become Human. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/threadpool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 451d441f572..84286fbee90 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1375,7 +1375,6 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) { InterlockedIncrement( &pool->refcount ); pool->num_workers++; - pool->num_busy_workers++; NtClose( thread ); } return status; @@ -2137,6 +2136,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa static void tp_object_prio_queue( struct threadpool_object *object ) { + ++object->pool->num_busy_workers; list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); } @@ -2330,7 +2330,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); - pool->num_busy_workers--; for (;;) { while ((ptr = threadpool_get_next_item( pool ))) @@ -2360,7 +2359,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Leave critical section and do the actual callback. */ object->num_associated_callbacks++; object->num_running_callbacks++; - pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); /* Initialize threadpool instance struct. */ @@ -2466,6 +2464,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) skip_cleanup: RtlEnterCriticalSection( &pool->cs ); + assert(pool->num_busy_workers); pool->num_busy_workers--; /* Simple callbacks are automatically shutdown after execution. */ -- 2.26.2

1 0