Commit 8458705f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "Disable cancellation everywhere (except in msg_Dbg) to start with"

Every thread function disables cancellation properly now.
parent be400691
...@@ -640,16 +640,13 @@ static void *thread_entry (void *data) ...@@ -640,16 +640,13 @@ static void *thread_entry (void *data)
{ {
vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object; vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object;
void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry; void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
int canc;
free (data); free (data);
#ifndef NDEBUG #ifndef NDEBUG
vlc_threadvar_set (&thread_object_key, obj); vlc_threadvar_set (&thread_object_key, obj);
#endif #endif
msg_Dbg (obj, "thread started"); msg_Dbg (obj, "thread started");
canc = vlc_savecancel ();
func (obj); func (obj);
vlc_restorecancel (canc);
msg_Dbg (obj, "thread ended"); msg_Dbg (obj, "thread ended");
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment