[vlc-devel] commit: Disable cancellation everywhere (except in msg_Dbg) to start with ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Aug 27 22:57:29 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jul  6 21:35:27 2008 +0300| [f7e7e079b4fbbcdd57c3bea2674e832d19065616] | committer: Rémi Denis-Courmont 

Disable cancellation everywhere (except in msg_Dbg) to start with

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7e7e079b4fbbcdd57c3bea2674e832d19065616
---

 src/misc/threads.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 69b9fd4..320066e 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -640,13 +640,16 @@ static void *thread_entry (void *data)
 {
     vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object;
     void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
+    int canc;
 
     free (data);
 #ifndef NDEBUG
     vlc_threadvar_set (&thread_object_key, obj);
 #endif
     msg_Dbg (obj, "thread started");
+    canc = vlc_savecancel ();
     func (obj);
+    vlc_restorecancel (canc);
     msg_Dbg (obj, "thread ended");
 
     return NULL;




More information about the vlc-devel mailing list