From 3b54853878930c087ff9c577d714c526ac82f08c Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 22 Oct 2010 21:59:18 +0000
Subject: [PATCH] This old native code for dispatching signals needs to die die
 die. It's long since been replaced by using the secret undocumented JDK APIs
 for doing the same thing. AFAIK that works on all of our servers and we're
 not shipping libsignal.so with anything.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6225 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml                                     |  14 +-
 .../presents/server/NativeSignalHandler.java  |  69 -----
 .../presents/server/PresentsServer.java       |   6 +-
 .../threerings/util/signal/FreeBSD/Makefile   |  45 ---
 ...com_threerings_util_signal_SignalManager.c |  96 ------
 .../util/signal/FreeBSD/libsignal.so          | Bin 6700 -> 0 bytes
 .../com/threerings/util/signal/Linux/Makefile |  45 ---
 ...com_threerings_util_signal_SignalManager.c |   1 -
 .../threerings/util/signal/Linux/libsignal.so | Bin 9594 -> 0 bytes
 .../threerings/util/signal/Mac OS X/Makefile  |  45 ---
 ...com_threerings_util_signal_SignalManager.c |   1 -
 .../util/signal/Mac OS X/libsignal.jnilib     | Bin 13580 -> 0 bytes
 .../threerings/util/signal/SignalManager.java | 277 ------------------
 ...com_threerings_util_signal_SignalManager.h | 104 -------
 14 files changed, 3 insertions(+), 700 deletions(-)
 delete mode 100644 src/main/java/com/threerings/presents/server/NativeSignalHandler.java
 delete mode 100644 src/main/java/com/threerings/util/signal/FreeBSD/Makefile
 delete mode 100644 src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
 delete mode 100755 src/main/java/com/threerings/util/signal/FreeBSD/libsignal.so
 delete mode 100644 src/main/java/com/threerings/util/signal/Linux/Makefile
 delete mode 120000 src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
 delete mode 100755 src/main/java/com/threerings/util/signal/Linux/libsignal.so
 delete mode 100644 src/main/java/com/threerings/util/signal/Mac OS X/Makefile
 delete mode 120000 src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c
 delete mode 100755 src/main/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib
 delete mode 100644 src/main/java/com/threerings/util/signal/SignalManager.java
 delete mode 100644 src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h

diff --git a/build.xml b/build.xml
index 22fe04d75..b60be861b 100644
--- a/build.xml
+++ b/build.xml
@@ -132,15 +132,6 @@
     <delete file="${deploy.dir}/aslib-config.xml"/>
   </target>
 
-  <condition property="isunix"><os family="unix"/></condition>
-  <target name="ninstall" depends="-prepare" if="isunix"
-          description="Builds the native libraries.">
-    <echo level="info" message="Doing native compilation on ${os.name}..."/>
-    <exec dir="${src.dir}/com/threerings/util/signal/${os.name}" executable="make">
-       <arg line="install"/>
-    </exec>
-  </target>
-
   <target name="javadoc" depends="-prepare" description="Builds the Java documentation">
     <mkdir dir="${deploy.dir}/docs"/>
     <javadoc sourcepath="${src.dir}" packagenames="com.threerings.*"
@@ -186,10 +177,10 @@
   </target>
 
   <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,compile,aslib,ninstall,javadoc,dist"/>
+  <target name="all" depends="clean,compile,aslib,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="compile,procstream,aslib,ninstall">
+  <target name="dist" depends="compile,procstream,aslib">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-base.jar">
       <fileset dir="${classes.dir}">
@@ -391,7 +382,6 @@
        <fileset dir=".">
          <include name="**"/>
          <exclude name="${deploy.dir}/**"/>
-         <exclude name="tests/${deploy.dir}/**"/>
          <exclude name="${lib.name}-*.zip"/>
        </fileset>
      </copy>
diff --git a/src/main/java/com/threerings/presents/server/NativeSignalHandler.java b/src/main/java/com/threerings/presents/server/NativeSignalHandler.java
deleted file mode 100644
index 638bf72e6..000000000
--- a/src/main/java/com/threerings/presents/server/NativeSignalHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// $Id$
-//
-// Narya library - tools for developing networked games
-// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
-// http://code.google.com/p/narya/
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published
-// by the Free Software Foundation; either version 2.1 of the License, or
-// (at your option) any later version.
-//
-// This library 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
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-package com.threerings.presents.server;
-
-import com.threerings.util.signal.SignalManager;
-
-import static com.threerings.presents.Log.log;
-
-/**
- * Handles signals using Narya's native libsignal.
- */
-public class NativeSignalHandler extends AbstractSignalHandler
-    implements SignalManager.SignalHandler
-{
-    // from interface SignalManager.SignalHandler
-    public boolean signalReceived (int signo)
-    {
-        switch (signo) {
-        case SignalManager.SIGTERM:
-            termReceived();
-            break;
-        case SignalManager.SIGINT:
-            intReceived();
-            break;
-        case SignalManager.SIGHUP:
-            hupReceived();
-            break;
-        case SignalManager.SIGUSR2:
-            usr2Received();
-            break;
-        default:
-            log.warning("Received unknown signal", "signo", signo);
-            break;
-        }
-        return true;
-    }
-
-    @Override
-    protected boolean registerHandlers ()
-    {
-        if (!SignalManager.servicesAvailable()) {
-            return false;
-        }
-        SignalManager.registerSignalHandler(SignalManager.SIGTERM, this);
-        SignalManager.registerSignalHandler(SignalManager.SIGINT, this);
-        SignalManager.registerSignalHandler(SignalManager.SIGHUP, this);
-        SignalManager.registerSignalHandler(SignalManager.SIGUSR2, this);
-        return true;
-    }
-}
diff --git a/src/main/java/com/threerings/presents/server/PresentsServer.java b/src/main/java/com/threerings/presents/server/PresentsServer.java
index a6bf25338..ee348e035 100644
--- a/src/main/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/main/java/com/threerings/presents/server/PresentsServer.java
@@ -179,15 +179,11 @@ public class PresentsServer
     protected void registerSignalHandlers (Injector injector)
     {
         // register SIGTERM, SIGINT (ctrl-c) and a SIGHUP handlers
-        boolean registered = false;
         try {
-            registered = injector.getInstance(SunSignalHandler.class).init();
+            injector.getInstance(SunSignalHandler.class).init();
         } catch (Throwable t) {
             log.warning("Unable to register Sun signal handlers", "error", t);
         }
-        if (!registered) {
-            injector.getInstance(NativeSignalHandler.class).init();
-        }
     }
 
     /**
diff --git a/src/main/java/com/threerings/util/signal/FreeBSD/Makefile b/src/main/java/com/threerings/util/signal/FreeBSD/Makefile
deleted file mode 100644
index ebdbbe0da..000000000
--- a/src/main/java/com/threerings/util/signal/FreeBSD/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-
-#
-# Executable definitions
-
-CC=gcc
-RM=rm
-CP=cp
-MKDIR=mkdir
-
-#
-# Directory definitions
-
-ROOT=../../../../../../..
-LIBRARIES_PATH=
-OSINCDIR!=uname -s | tr 'A-Z' 'a-z'
-INSTALL_PATH=${ROOT}/dist/lib/i386-FreeBSD
-
-#
-# Parameter and file definitions
-
-INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OSINCDIR}
-LIBRARIES=
-TARGET=libsignal.so
-
-#
-# Target definitions
-
-all: ${TARGET}
-
-install:
-	@${MKDIR} -p ${INSTALL_PATH}
-	cp ${TARGET} ${INSTALL_PATH}
-
-${TARGET}: com_threerings_util_signal_SignalManager.c
-	@echo "Compiling SignalManager.c"
-	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
-	    -o com_threerings_util_signal_SignalManager.o
-	@echo "Creating libsignal.so"
-	@${CC} -o ${TARGET} com_threerings_util_signal_SignalManager.o \
-	    ${LIBRARIES} ${LIBRARIES_PATH} -shared
-
-clean:
-	-${RM} -f *.o ${TARGET}
diff --git a/src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
deleted file mode 100644
index e8113cf77..000000000
--- a/src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * $Id$
- */
-
-#include <signal.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <jni.h>
-#include "com_threerings_util_signal_SignalManager.h"
-
-static int writefd;
-
-typedef void (*sighandler_t)(int);
-static sighandler_t old_handlers[64];
-static sighandler_t handlers[64];
-
-static void
-signal_handler (int signo)
-{
-    write(writefd, &signo, sizeof(signo));
-    signal(SIGINT, signal_handler);
-}
-
-/**
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    activateHandler
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL
-Java_com_threerings_util_signal_SignalManager_activateHandler (
-    JNIEnv* env, jclass clazz, jint signo)
-{
-    old_handlers[signo] = signal(signo, signal_handler);
-    if (old_handlers[signo] == SIG_ERR) {
-        fprintf(stderr, "Error setting signal handler (%d): %s\n",
-                signo, strerror(errno));
-        old_handlers[signo] = 0;
-    } else {
-        handlers[signo] = signal_handler;
-    }
-}
-
-/**
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    deactivateHandler
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL
-Java_com_threerings_util_signal_SignalManager_deactivateHandler (
-    JNIEnv* env, jclass clazz, jint signo)
-{
-    if (old_handlers[signo] != 0) {
-        signal(signo, old_handlers[signo]);
-        old_handlers[signo] = 0;
-        handlers[signo] = 0;
-    }
-}
-
-/**
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    dispatchSignals
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_com_threerings_util_signal_SignalManager_dispatchSignals (
-    JNIEnv* env, jclass clazz)
-{
-    int filedes[2], readfd;
-    jint signo;
-    jmethodID mid = (*env)->GetStaticMethodID(
-        env, clazz, "signalReceived", "(I)V");
-
-    if (pipe(filedes) < 0) {
-        fprintf(stderr, "Failed to create signal pipe: %s\n", strerror(errno));
-        return;
-    }
-    readfd = filedes[0];
-    writefd = filedes[1];
-
-    while (1) {
-        int got = read(readfd, &signo, sizeof(int));
-        if (got < 0) {
-            fprintf(stderr, "Signal pipe read failed: %s\n", strerror(errno));
-        } else if (got == 0) {
-            fprintf(stderr, "Signal pipe read returned zero bytes.\n");
-        } else {
-            if (signo < 0 || signo >= 64 || handlers[signo] == 0) {
-                fprintf(stderr, "Received bogus signal (%d).\n", signo);
-            } else {
-                (*env)->CallStaticVoidMethod(env, clazz, mid, signo);
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/threerings/util/signal/FreeBSD/libsignal.so b/src/main/java/com/threerings/util/signal/FreeBSD/libsignal.so
deleted file mode 100755
index c9ded61ebd03d460a75feca15ff1012a22b27617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6700
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
Y?i?m%0Pg|UqbxvZ-XTDG=TPdu0By-0dH?_b

diff --git a/src/main/java/com/threerings/util/signal/Linux/Makefile b/src/main/java/com/threerings/util/signal/Linux/Makefile
deleted file mode 100644
index 0143ab94e..000000000
--- a/src/main/java/com/threerings/util/signal/Linux/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id: Makefile 3328 2005-02-03 01:16:12Z mdb $
-
-#
-# Executable definitions
-
-CC=gcc
-RM=rm
-CP=cp
-MKDIR=mkdir
-
-#
-# Directory definitions
-
-ROOT=../../../../../../..
-LIBRARIES_PATH=
-OSINCDIR:=$(shell uname -s | tr 'A-Z' 'a-z')
-INSTALL_PATH=${ROOT}/dist/lib/i686-Linux
-
-#
-# Parameter and file definitions
-
-INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OSINCDIR}
-LIBRARIES=
-TARGET=libsignal.so
-
-#
-# Target definitions
-
-all: ${TARGET}
-
-install:
-	@${MKDIR} -p ${INSTALL_PATH}
-	cp ${TARGET} ${INSTALL_PATH}
-
-${TARGET}: com_threerings_util_signal_SignalManager.c
-	@echo "Compiling SignalManager.c"
-	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
-	    -o com_threerings_util_signal_SignalManager.o
-	@echo "Creating libsignal.so"
-	@${CC} -o ${TARGET} com_threerings_util_signal_SignalManager.o \
-	    ${LIBRARIES} ${LIBRARIES_PATH} -shared
-
-clean:
-	-${RM} -f *.o ${TARGET}
diff --git a/src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
deleted file mode 120000
index 8e15e94bd..000000000
--- a/src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
+++ /dev/null
@@ -1 +0,0 @@
-../FreeBSD/com_threerings_util_signal_SignalManager.c
\ No newline at end of file
diff --git a/src/main/java/com/threerings/util/signal/Linux/libsignal.so b/src/main/java/com/threerings/util/signal/Linux/libsignal.so
deleted file mode 100755
index 769b3dbb5e363ad149cb062441467925ac450294..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9594
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

diff --git a/src/main/java/com/threerings/util/signal/Mac OS X/Makefile b/src/main/java/com/threerings/util/signal/Mac OS X/Makefile
deleted file mode 100644
index d75345dcf..000000000
--- a/src/main/java/com/threerings/util/signal/Mac OS X/Makefile	
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id: Makefile 3332 2005-02-03 01:30:33Z mdb $
-
-#
-# Executable definitions
-
-CC=gcc
-RM=rm
-CP=cp
-MKDIR=mkdir
-
-#
-# Directory definitions
-
-ROOT=../../../../../../..
-LIBRARIES_PATH=
-OSINCDIR!=uname -s | tr 'A-Z' 'a-z'
-INSTALL_PATH=${ROOT}/dist/lib/`uname -m`-Darwin
-
-#
-# Parameter and file definitions
-
-INCLUDES=-I.. -I/System/Library/Frameworks/JavaVM.framework/Headers
-LIBRARIES=
-TARGET=libsignal.jnilib
-
-#
-# Target definitions
-
-all: ${TARGET}
-
-install:
-	@${MKDIR} -p ${INSTALL_PATH}
-	cp ${TARGET} ${INSTALL_PATH}
-
-${TARGET}: com_threerings_util_signal_SignalManager.c
-	@echo "Compiling $<"
-	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
-	    -o com_threerings_util_signal_SignalManager.o
-	@echo "Creating $@"
-	@${CC} -o ${TARGET} com_threerings_util_signal_SignalManager.o \
-	    ${LIBRARIES} ${LIBRARIES_PATH} -dynamiclib
-
-clean:
-	-${RM} -f *.o ${TARGET}
diff --git a/src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c
deleted file mode 120000
index 8e15e94bd..000000000
--- a/src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c	
+++ /dev/null
@@ -1 +0,0 @@
-../FreeBSD/com_threerings_util_signal_SignalManager.c
\ No newline at end of file
diff --git a/src/main/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib b/src/main/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib
deleted file mode 100755
index 930bba02e9005e5968f39ed12f6873fc2b64d960..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13580
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

diff --git a/src/main/java/com/threerings/util/signal/SignalManager.java b/src/main/java/com/threerings/util/signal/SignalManager.java
deleted file mode 100644
index 535ec4947..000000000
--- a/src/main/java/com/threerings/util/signal/SignalManager.java
+++ /dev/null
@@ -1,277 +0,0 @@
-//
-// $Id$
-//
-// Narya library - tools for developing networked games
-// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
-// http://code.google.com/p/narya/
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published
-// by the Free Software Foundation; either version 2.1 of the License, or
-// (at your option) any later version.
-//
-// This library 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
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-package com.threerings.util.signal;
-
-import com.samskivert.util.HashIntMap;
-import com.samskivert.util.ObserverList;
-
-import static com.threerings.NaryaLog.log;
-
-/**
- * Uses native code to catch Unix signals and invoke callbacks on a separate signal handler thread.
- * If the native library cannot be loaded, signal handlers will be allowed to be registered but
- * will never be called.
- */
-public class SignalManager
-{
-    /* Hangup (POSIX). */
-    public static final int SIGHUP = 1;
-
-    /* Interrupt (ANSI). */
-    public static final int SIGINT = 2;
-
-    /* Quit (POSIX). */
-    public static final int SIGQUIT = 3;
-
-    /* Illegal instruction (ANSI). */
-    public static final int SIGILL = 4;
-
-    /* Trace trap (POSIX). */
-    public static final int SIGTRAP = 5;
-
-    /* Abort (ANSI). */
-    public static final int SIGABRT = 6;
-
-    /* IOT trap (4.2 BSD). */
-    public static final int SIGIOT = 6;
-
-    /* BUS error (4.2 BSD). */
-    public static final int SIGBUS = 7;
-
-    /* Floating-point exception (ANSI). */
-    public static final int SIGFPE = 8;
-
-    /* Kill, unblockable (POSIX). */
-    public static final int SIGKILL = 9;
-
-    /* User-defined signal 1 (POSIX). */
-    public static final int SIGUSR1 = 10;
-
-    /* Segmentation violation (ANSI). */
-    public static final int SIGSEGV = 11;
-
-    /* User-defined signal 2 (POSIX). */
-    public static final int SIGUSR2 = 12;
-
-    /* Broken pipe (POSIX). */
-    public static final int SIGPIPE = 13;
-
-    /* Alarm clock (POSIX). */
-    public static final int SIGALRM = 14;
-
-    /* Termination (ANSI). */
-    public static final int SIGTERM = 15;
-
-    /* Stack fault. */
-    public static final int SIGSTKFLT = 16;
-
-    /* Child status has changed (POSIX). */
-    public static final int SIGCHLD = 17;
-
-    /* Continue (POSIX). */
-    public static final int SIGCONT = 18;
-
-    /* Stop, unblockable (POSIX). */
-    public static final int SIGSTOP = 19;
-
-    /* Keyboard stop (POSIX). */
-    public static final int SIGTSTP = 20;
-
-    /* Background read from tty (POSIX). */
-    public static final int SIGTTIN = 21;
-
-    /* Background write to tty (POSIX). */
-    public static final int SIGTTOU = 22;
-
-    /* Urgent condition on socket (4.2 BSD). */
-    public static final int SIGURG = 23;
-
-    /* CPU limit exceeded (4.2 BSD). */
-    public static final int SIGXCPU = 24;
-
-    /* File size limit exceeded (4.2 BSD). */
-    public static final int SIGXFSZ = 25;
-
-    /* Virtual alarm clock (4.2 BSD). */
-    public static final int SIGVTALRM = 26;
-
-    /* Profiling alarm clock (4.2 BSD). */
-    public static final int SIGPROF = 27;
-
-    /* Window size change (4.3 BSD, Sun). */
-    public static final int SIGWINCH = 28;
-
-    /* I/O now possible (4.2 BSD). */
-    public static final int SIGIO = 29;
-
-    /* Pollable event occurred (System V). */
-    public static final int SIGPOLL = SIGIO;
-
-    /* Power failure restart (System V). */
-    public static final int SIGPWR = 30;
-
-     /* Bad system call. */
-    public static final int SIGSYS = 31;
-
-    /** Used to dispatch signal notifications. */
-    public static interface SignalHandler
-    {
-        /**
-         * Called when the specified signal is received.
-         *
-         * @return true if the signal handler should remain registered, false if it should be
-         * removed.
-         */
-        boolean signalReceived (int signal);
-    }
-
-    /**
-     * Returns true if signal dispatching services are available, false if we could not load our
-     * native library.
-     */
-    public static boolean servicesAvailable ()
-    {
-        return _haveLibrary;
-    }
-
-    /**
-     * Registers a signal handler for the specified signal.
-     */
-    public synchronized static void registerSignalHandler (int signal, SignalHandler handler)
-    {
-        ObserverList<SignalHandler> list = _handlers.get(signal);
-        if (list == null) {
-            _handlers.put(signal, list = new ObserverList<SignalHandler>(
-                              ObserverList.SAFE_IN_ORDER_NOTIFY));
-            if (_haveLibrary) {
-                activateHandler(signal);
-            }
-        }
-        list.add(handler);
-
-        // make sure the signal dispatcher thread is started
-        if (_haveLibrary && _sigdis == null) {
-            _sigdis = new Thread("SignalDispatcher") {
-                @Override
-                public void run () {
-                    log.info("Dispatching signals...");
-                    dispatchSignals();
-                }
-            };
-            _sigdis.setDaemon(true);
-            _sigdis.start();
-        }
-    }
-
-    /**
-     * Removes the registration for the specified signal handler.
-     */
-    public synchronized static void removeSignalHandler (int signal, SignalHandler handler)
-    {
-        ObserverList<SignalHandler> list = _handlers.get(signal);
-        if (list == null || !list.contains(handler)) {
-            log.warning("Requested to remove non-registered handler", "signal", signal,
-                        "handler", handler);
-            return;
-        }
-        list.remove(handler);
-        checkEmpty(signal);
-    }
-
-    /**
-     * Called by native code when a signal is received.
-     */
-    protected synchronized static void signalReceived (final int signal)
-    {
-        // this is hack, but we seem to get a call to our signal handler for each thread if the
-        // user presses ctrl-c in the terminal, so we "collapse" those into one call back
-        long now = System.currentTimeMillis();
-        if (signal == SIGINT) {
-            if (now - _lastINTed < 10) {
-                return;
-            } else {
-                _lastINTed = now;
-            }
-        }
-        ObserverList<SignalHandler> list = _handlers.get(signal);
-        if (list != null) {
-            list.apply(new ObserverList.ObserverOp<SignalHandler>() {
-                public boolean apply (SignalHandler handler) {
-                    return handler.signalReceived(signal);
-                }
-            });
-        }
-        checkEmpty(signal);
-    }
-
-    /**
-     * Called when a signal handler is removed.
-     */
-    protected static void checkEmpty (int signal)
-    {
-        ObserverList<SignalHandler> list = _handlers.get(signal);
-        if (list != null && list.size() == 0) {
-            _handlers.remove(signal);
-            if (_haveLibrary) {
-                deactivateHandler(signal);
-            }
-        }
-    }
-
-    /**
-     * Activates the signal handler for the specified signal.
-     */
-    protected static native void activateHandler (int signal);
-
-    /**
-     * Deactivates the signal handler for the specified signal.
-     */
-    protected static native void deactivateHandler (int signal);
-
-    /**
-     * Consigns a Java thread to the task of dispatching signal handler callbacks.
-     */
-    protected static native void dispatchSignals ();
-
-    /** A mapping from signal number to a list of handlers. */
-    protected static HashIntMap<ObserverList<SignalHandler>> _handlers =
-        new HashIntMap<ObserverList<SignalHandler>>();
-
-    /** Our signal dispatcher thread. */
-    protected static Thread _sigdis;
-
-    /** Set to true if we successfully load our native library. */
-    protected static boolean _haveLibrary;
-
-    /** Used to collapse bogus multiple delivery of SIGINT when the user pressed ctrl-c in the
-     * console. */
-    protected static long _lastINTed = 0L;
-
-    static {
-        try {
-            System.loadLibrary("signal");
-            _haveLibrary = true;
-        } catch (Throwable t) {
-            log.info("Could not load libsignal.so; signal handling disabled.");
-        }
-    }
-}
diff --git a/src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h b/src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h
deleted file mode 100644
index afb53a0aa..000000000
--- a/src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_threerings_util_signal_SignalManager */
-
-#ifndef _Included_com_threerings_util_signal_SignalManager
-#define _Included_com_threerings_util_signal_SignalManager
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_threerings_util_signal_SignalManager_SIGHUP
-#define com_threerings_util_signal_SignalManager_SIGHUP 1L
-#undef com_threerings_util_signal_SignalManager_SIGINT
-#define com_threerings_util_signal_SignalManager_SIGINT 2L
-#undef com_threerings_util_signal_SignalManager_SIGQUIT
-#define com_threerings_util_signal_SignalManager_SIGQUIT 3L
-#undef com_threerings_util_signal_SignalManager_SIGILL
-#define com_threerings_util_signal_SignalManager_SIGILL 4L
-#undef com_threerings_util_signal_SignalManager_SIGTRAP
-#define com_threerings_util_signal_SignalManager_SIGTRAP 5L
-#undef com_threerings_util_signal_SignalManager_SIGABRT
-#define com_threerings_util_signal_SignalManager_SIGABRT 6L
-#undef com_threerings_util_signal_SignalManager_SIGIOT
-#define com_threerings_util_signal_SignalManager_SIGIOT 6L
-#undef com_threerings_util_signal_SignalManager_SIGBUS
-#define com_threerings_util_signal_SignalManager_SIGBUS 7L
-#undef com_threerings_util_signal_SignalManager_SIGFPE
-#define com_threerings_util_signal_SignalManager_SIGFPE 8L
-#undef com_threerings_util_signal_SignalManager_SIGKILL
-#define com_threerings_util_signal_SignalManager_SIGKILL 9L
-#undef com_threerings_util_signal_SignalManager_SIGUSR1
-#define com_threerings_util_signal_SignalManager_SIGUSR1 10L
-#undef com_threerings_util_signal_SignalManager_SIGSEGV
-#define com_threerings_util_signal_SignalManager_SIGSEGV 11L
-#undef com_threerings_util_signal_SignalManager_SIGUSR2
-#define com_threerings_util_signal_SignalManager_SIGUSR2 12L
-#undef com_threerings_util_signal_SignalManager_SIGPIPE
-#define com_threerings_util_signal_SignalManager_SIGPIPE 13L
-#undef com_threerings_util_signal_SignalManager_SIGALRM
-#define com_threerings_util_signal_SignalManager_SIGALRM 14L
-#undef com_threerings_util_signal_SignalManager_SIGTERM
-#define com_threerings_util_signal_SignalManager_SIGTERM 15L
-#undef com_threerings_util_signal_SignalManager_SIGSTKFLT
-#define com_threerings_util_signal_SignalManager_SIGSTKFLT 16L
-#undef com_threerings_util_signal_SignalManager_SIGCHLD
-#define com_threerings_util_signal_SignalManager_SIGCHLD 17L
-#undef com_threerings_util_signal_SignalManager_SIGCONT
-#define com_threerings_util_signal_SignalManager_SIGCONT 18L
-#undef com_threerings_util_signal_SignalManager_SIGSTOP
-#define com_threerings_util_signal_SignalManager_SIGSTOP 19L
-#undef com_threerings_util_signal_SignalManager_SIGTSTP
-#define com_threerings_util_signal_SignalManager_SIGTSTP 20L
-#undef com_threerings_util_signal_SignalManager_SIGTTIN
-#define com_threerings_util_signal_SignalManager_SIGTTIN 21L
-#undef com_threerings_util_signal_SignalManager_SIGTTOU
-#define com_threerings_util_signal_SignalManager_SIGTTOU 22L
-#undef com_threerings_util_signal_SignalManager_SIGURG
-#define com_threerings_util_signal_SignalManager_SIGURG 23L
-#undef com_threerings_util_signal_SignalManager_SIGXCPU
-#define com_threerings_util_signal_SignalManager_SIGXCPU 24L
-#undef com_threerings_util_signal_SignalManager_SIGXFSZ
-#define com_threerings_util_signal_SignalManager_SIGXFSZ 25L
-#undef com_threerings_util_signal_SignalManager_SIGVTALRM
-#define com_threerings_util_signal_SignalManager_SIGVTALRM 26L
-#undef com_threerings_util_signal_SignalManager_SIGPROF
-#define com_threerings_util_signal_SignalManager_SIGPROF 27L
-#undef com_threerings_util_signal_SignalManager_SIGWINCH
-#define com_threerings_util_signal_SignalManager_SIGWINCH 28L
-#undef com_threerings_util_signal_SignalManager_SIGIO
-#define com_threerings_util_signal_SignalManager_SIGIO 29L
-#undef com_threerings_util_signal_SignalManager_SIGPOLL
-#define com_threerings_util_signal_SignalManager_SIGPOLL 29L
-#undef com_threerings_util_signal_SignalManager_SIGPWR
-#define com_threerings_util_signal_SignalManager_SIGPWR 30L
-#undef com_threerings_util_signal_SignalManager_SIGSYS
-#define com_threerings_util_signal_SignalManager_SIGSYS 31L
-/* Inaccessible static: _handlers */
-/*
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    activateHandler
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_threerings_util_signal_SignalManager_activateHandler
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    deactivateHandler
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_threerings_util_signal_SignalManager_deactivateHandler
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_threerings_util_signal_SignalManager
- * Method:    dispatchSignals
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_threerings_util_signal_SignalManager_dispatchSignals
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif