Mercurial > audlegacy

changeset 2156:a792aaee8e8e trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - new signal handling which does not block (based on concept from BMP 0.9.8 that never got released)
author nenolod
date Mon, 18 Dec 2006 03:59:55 -0800
parents 840263ee3a5c
children 783cfd804422
files ChangeLog audacious/Makefile audacious/main.c audacious/signals.c audacious/signals.h
diffstat 5 files changed, 158 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 18 03:34:52 2006 -0800
+++ b/ChangeLog	Mon Dec 18 03:59:55 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-18 11:34:52 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [3315]
+  - fix the logic of bmp_playback_stop(). now JTF works well even if the playing is paused.
+  
+  trunk/audacious/playback.c |    3 ++-
+  1 file changed, 2 insertions(+), 1 deletion(-)
+
+
 2006-12-18 11:34:11 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3313]
   - add proper XML header
--- a/audacious/Makefile	Mon Dec 18 03:34:52 2006 -0800
+++ b/audacious/Makefile	Mon Dec 18 03:59:55 2006 -0800
@@ -72,7 +72,8 @@
 	getopt.c getopt1.c \
 	iir.c \
 	iir_cfs.c \
-	iir_fpu.c
+	iir_fpu.c \
+	signals.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/audacious/main.c	Mon Dec 18 03:34:52 2006 -0800
+++ b/audacious/main.c	Mon Dec 18 03:59:55 2006 -0800
@@ -71,6 +71,7 @@
 #include "visualization.h"
 #include "build_stamp.h"
 #include "ui_fileinfo.h"
+#include "signals.h"
 
 #include "pixmaps.h"
 #include "images/audacious_player.xpm"
@@ -970,26 +971,6 @@
 }
 
 static void
-segfault_handler(gint sig)
-{
-    g_printerr(_("\nReceived SIGSEGV\n\n"
-                 "This could be a bug in Audacious. If you don't know why this happened, "
-                 "file a bug at http://bugs-meta.atheme.org/\n\n"));
-#ifdef HANDLE_SIGSEGV
-    exit(EXIT_FAILURE);
-#else
-    abort();
-#endif
-}
-
-/* Handles SIGINT/SIGTERM events gracefully. */
-static void
-sigterm_handler(gint sig)
-{
-    mainwin_quit_cb();
-}
-
-static void
 bmp_setup_logger(void)
 {
     if (!bmp_logger_start(bmp_paths[BMP_PATH_LOG_FILE]))
@@ -1093,18 +1074,7 @@
     if (options.no_log == FALSE)
         bmp_setup_logger();
 
-    signal(SIGPIPE, SIG_IGN);   /* for controlsocket.c */
-    signal(SIGINT,  sigterm_handler);
-    signal(SIGTERM, sigterm_handler);
-
-    /* in particular environment (maybe with glibc 2.5), core file
-       through signal handler doesn't contain useful back trace. */
-    {
-        char *magic;
-        magic = getenv("AUD_ENSURE_BACKTRACE");
-        if(magic == NULL)
-            signal(SIGSEGV, segfault_handler);
-    }
+    signal_handlers_init();
 
     g_random_set_seed(time(NULL));
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/signals.c	Mon Dec 18 03:59:55 2006 -0800
@@ -0,0 +1,118 @@
+/*
+ * Audacious
+ * Copyright (c) 2005-2007 Audacious development team
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2005  BMP development team.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; under version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <config.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#include "signals.h"
+
+typedef void (*SignalHandler) (gint);
+
+static SignalHandler
+signal_install_handler_full (gint           signal_number,
+                             SignalHandler  handler,
+                             gint          *signals_to_block,
+                             gsize          n_signals)
+{
+    struct sigaction action, old_action;
+    gsize i;
+
+    action.sa_handler = handler;
+    action.sa_flags = SA_RESTART;
+
+    sigemptyset (&action.sa_mask);
+
+    for (i = 0; i < n_signals; i++)
+        sigaddset (&action.sa_mask, signals_to_block[i]);
+
+    if (sigaction (signal_number, &action, &old_action) == -1)
+    {
+        g_message ("Failed to install handler for signal %d", signal_number);
+        return NULL;
+    }
+
+    return old_action.sa_handler;    
+}
+
+/* 
+ * A version of signal() that works more reliably across different
+ * platforms. It: 
+ * a. restarts interrupted system calls
+ * b. does not reset the handler
+ * c. blocks the same signal within the handler
+ *
+ * (adapted from Unix Network Programming Vol. 1)
+ */
+static SignalHandler
+signal_install_handler (gint          signal_number,
+                        SignalHandler handler)
+{
+    return signal_install_handler_full (signal_number, handler, NULL, 0);
+}
+
+static void
+signal_empty_handler (gint signal_number)
+{
+    /* empty */
+}
+
+static void
+sigsegv_handler (gint signal_number)
+{
+#ifdef HANDLE_SIGSEGV
+    g_printerr(_("\nReceived SIGSEGV\n\n"
+                 "This could be a bug in Audacious. If you don't know why this happened, "
+                 "file a bug at http://bugs-meta.atheme.org/\n\n"));
+
+    exit (EXIT_FAILURE);
+#else
+    abort ();
+#endif
+}
+
+static void
+sigterm_handler (gint signal_number)
+{
+    mainwin_quit_cb();
+}
+
+void 
+signal_handlers_init (void)
+{
+    char *magic;
+    magic = getenv("AUD_ENSURE_BACKTRACE");
+
+    signal_install_handler (SIGPIPE, signal_empty_handler);
+    signal_install_handler (SIGINT, sigterm_handler);
+    signal_install_handler (SIGTERM, sigterm_handler);
+
+    /* in particular environment (maybe with glibc 2.5), core file
+       through signal handler doesn't contain useful back trace. --yaz */
+    if (magic == NULL)
+        signal_install_handler(SIGSEGV, sigsegv_handler);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/signals.h	Mon Dec 18 03:59:55 2006 -0800
@@ -0,0 +1,28 @@
+/*
+ * Audacious
+ * Copyright (c) 2005-2007 Audacious development team
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2005  BMP development team.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; under version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef SIGNALS_H
+#define SIGNALS_H
+
+void signal_handlers_init(void);
+
+#endif