From owner-p4-projects@FreeBSD.ORG Sat Jul 21 03:49:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E71516A41F; Sat, 21 Jul 2007 03:49:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E6816A417 for ; Sat, 21 Jul 2007 03:49:45 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04E1B13C46B for ; Sat, 21 Jul 2007 03:49:45 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6L3niIL084288 for ; Sat, 21 Jul 2007 03:49:44 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6L3niEe084285 for perforce@freebsd.org; Sat, 21 Jul 2007 03:49:44 GMT (envelope-from andrew@freebsd.org) Date: Sat, 21 Jul 2007 03:49:44 GMT Message-Id: <200707210349.l6L3niEe084285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jul 2007 03:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123833 Change 123833 by andrew@andrew_hermies on 2007/07/21 03:49:03 When a the communications thread is closed also kill the update thread Listen to more signals Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#15 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#15 (text+ko) ==== @@ -76,6 +76,7 @@ static struct facund_response *facund_call_restart_services(const char *, struct facund_object *); +static int facund_signals[] = { SIGHUP, SIGINT, SIGTERM }; static void facund_signal_handler(int, siginfo_t *, void *); /* @@ -152,6 +153,12 @@ /* Add a signal event to check if there was a signal sent */ EV_SET(&event, SIGINT, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); kevent(kq, &event, 1, NULL, 0, NULL); + for (pos = 0; pos < sizeof(facund_signals) / sizeof(facund_signals[0]); + pos++) { + EV_SET(&event, facund_signals[pos], EVFILT_SIGNAL, EV_ADD, + 0, 0, NULL); + kevent(kq, &event, 1, NULL, 0, NULL); + } use_kqueue = 1; found_updates = 0; @@ -557,6 +564,7 @@ struct facund_conn *conn; const char *config_file; char *basedirs_string, **base_dirs; + unsigned int pos; int config_fd; properties config_data; char ch; @@ -580,10 +588,13 @@ basedirs_string = NULL; - sa.sa_sigaction = facund_signal_handler; - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_SIGINFO; - sigaction(SIGINT, &sa, NULL); + for (pos = 0; pos < sizeof(facund_signals) / sizeof(facund_signals[0]); + pos++) { + sa.sa_sigaction = facund_signal_handler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_SIGINFO; + sigaction(facund_signals[pos], &sa, NULL); + } /* Read in the config file */ config_fd = open(config_file, O_RDONLY); @@ -632,6 +643,11 @@ /* Wait for the threads to quit */ pthread_join(comms_thread, NULL); + /* + * As the communications thread has quit we should + * also kill the update thread so we can exit + */ + pthread_kill(update_thread, SIGINT); pthread_join(update_thread, NULL); if (conn != NULL)