Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / core / pidwait.c

diff --git a/apps/irssi/src/core/pidwait.c b/apps/irssi/src/core/pidwait.c
index bb48d0d07ebe862dc085f287a95d50baa8cbab19..7fc06195c76b482a13ad3405c34d39506db6545b 100644 (file)
--- a/apps/irssi/src/core/pidwait.c
+++ b/apps/irssi/src/core/pidwait.c
@@ -13,32 +13,47 @@
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    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 "module.h"
 #include "signals.h"
 #include "modules.h"
 
-#include <sys/wait.h>
-
+static GHashTable *child_pids;
 static GSList *pids;
 
-static unsigned int childcheck_tag;
 static int signal_pidwait;
 
+static void sig_child(GPid pid, gint status, gpointer data)
+{
+       signal_emit_id(signal_pidwait, 2, GINT_TO_POINTER(pid),
+                      GINT_TO_POINTER(status));
+       g_hash_table_remove(child_pids, GINT_TO_POINTER(pid));
+       pids = g_slist_remove(pids, GINT_TO_POINTER(pid));
+}
+
 /* add a pid to wait list */
 void pidwait_add(int pid)
 {
-       pids = g_slist_append(pids, GINT_TO_POINTER(pid));
+       if (g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid)) == NULL) {
+               int id = g_child_watch_add_full(10, pid, sig_child, NULL, NULL);
+               g_hash_table_insert(child_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(id));
+               pids = g_slist_append(pids, GINT_TO_POINTER(pid));
+       }
 }
 
 /* remove pid from wait list */
 void pidwait_remove(int pid)
 {
-       pids = g_slist_remove(pids, GINT_TO_POINTER(pid));
+       gpointer id = g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid));
+       if (id != NULL) {
+               g_source_remove(GPOINTER_TO_INT(id));
+               g_hash_table_remove(child_pids, GINT_TO_POINTER(pid));
+               pids = g_slist_remove(pids, GINT_TO_POINTER(pid));
+       }
 }
 
 /* return list of pids that are being waited.
@@ -48,37 +63,16 @@ GSList *pidwait_get_pids(void)
         return pids;
 }
 
-static int child_check(void)
-{
-       GSList *tmp, *next;
-       int status;
-
-       /* wait for each pid.. */
-       for (tmp = pids; tmp != NULL; tmp = next) {
-               int pid = GPOINTER_TO_INT(tmp->data);
-
-               next = tmp->next;
-               if (waitpid(pid, &status, WNOHANG) > 0) {
-                       /* process terminated, remove from list */
-                       signal_emit_id(signal_pidwait, 2, tmp->data,
-                                      GINT_TO_POINTER(status));
-                       pids = g_slist_remove(pids, tmp->data);
-               }
-       }
-       return 1;
-}
-
 void pidwait_init(void)
 {
+       child_pids = g_hash_table_new(g_direct_hash, g_direct_equal);
        pids = NULL;
-       childcheck_tag = g_timeout_add(1000, (GSourceFunc) child_check, NULL);
 
        signal_pidwait = signal_get_uniq_id("pidwait");
 }
 
 void pidwait_deinit(void)
 {
+       g_hash_table_destroy(child_pids);
        g_slist_free(pids);
-
-       g_source_remove(childcheck_tag);
 }