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

signals: ugly and unsafe kludge to run the QProcess SIGCHLD handler

parent faca3a7a
...@@ -771,7 +771,7 @@ if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then ...@@ -771,7 +771,7 @@ if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
if test "${ac_cv_my_have_dlopen}" = "yes"; then if test "${ac_cv_my_have_dlopen}" = "yes"; then
AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API]) AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
ac_cv_have_plugins=yes ac_cv_have_plugins=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL]) VLC_ADD_LIBS([libvlccore realvideo lua signals],[$LIBDL])
fi fi
fi fi
AC_SUBST(LIBDL) AC_SUBST(LIBDL)
......
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#ifdef __GLIBC__
# include <dlfcn.h>
#endif
static int Open (vlc_object_t *); static int Open (vlc_object_t *);
static void Close (vlc_object_t *); static void Close (vlc_object_t *);
...@@ -118,6 +121,30 @@ static void *SigThread (void *data) ...@@ -118,6 +121,30 @@ static void *SigThread (void *data)
* cancellation point */ * cancellation point */
vlc_testcancel(); vlc_testcancel();
#endif #endif
/* Hack for Qt QProcess */
if (signum == SIGCHLD)
{
struct sigaction act;
sigaction (signum, NULL, &act);
if ((act.sa_flags & SA_SIGINFO) || (act.sa_handler != SIG_DFL))
{
msg_Err (obj, "signal %d overriden (%p)", signum,
act.sa_handler);
#ifdef __GLIBC__
Dl_info info;
if (dladdr (act.sa_handler, &info))
msg_Err (obj, " %s(%s)[%p]",
info.dli_fname ? info.dli_fname : "?",
info.dli_sname ? info.dli_sname : "?",
info.dli_saddr);
#endif
if (!(act.sa_flags & SA_SIGINFO) && (act.sa_handler != SIG_IGN))
act.sa_handler (signum);
}
}
} }
while (signum == SIGCHLD); while (signum == SIGCHLD);
......
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