From patchwork Mon Aug 13 14:41:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1313361 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 59E783FC23 for ; Mon, 13 Aug 2012 14:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751787Ab2HMOmh (ORCPT ); Mon, 13 Aug 2012 10:42:37 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:64316 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751736Ab2HMOmh (ORCPT ); Mon, 13 Aug 2012 10:42:37 -0400 Received: by ghrr11 with SMTP id r11so3059993ghr.19 for ; Mon, 13 Aug 2012 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=oMrECXRvHbbbqoJy/1WRzKhecct5P0Mzs03T8QP2N80=; b=yQu0YBJGh2iabuwfREfO9yjpqwSqL4TRFCcEz09okOK4NFEsj6sLxM9zbCg64OAVVe QbxddRAq6OeD39h+w6wP5/PWJPKEGvvP1X4znr/Mr6tFiLb2VQMTMr9/H77eCr9mkRfr DqF0wAqI1hwbZcUKmzGmdrj7cDetpvAefQcqktM2XWAuYr9XFlyj7xoXaUIiGXiG4hfN yE6yLBs4vkHg1nl8J7qcWv/B6Yk4kjUTyB287z5e12xznLJ4tLhE6I+2n/xtPaQb3G8J r0u5b7fdfJktSSU7mbJcIIon2Knwc7DmOyaw8wpB8dWYzW7w9LDLhrOnsj5NK6/yudFy gSog== Received: by 10.68.213.97 with SMTP id nr1mr15343913pbc.105.1344868956263; Mon, 13 Aug 2012 07:42:36 -0700 (PDT) Received: from debian-sid.localdomain ([123.115.214.125]) by mx.google.com with ESMTPS id wd6sm5114899pbc.15.2012.08.13.07.42.32 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:42:35 -0700 (PDT) From: Peng Tao To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH 2/2] blkmapd: proper signal handling Date: Mon, 13 Aug 2012 22:41:55 +0800 Message-Id: <1344868915-1813-2-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1344868915-1813-1-git-send-email-bergwolf@gmail.com> References: <1344868915-1813-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Peng Tao --- utils/blkmapd/device-discovery.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c index 8eddf50..df4627e 100644 --- a/utils/blkmapd/device-discovery.c +++ b/utils/blkmapd/device-discovery.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -61,6 +62,7 @@ struct bl_disk *visible_disk_list; int bl_watch_fd, bl_pipe_fd, nfs_pipedir_wfd, rpc_pipedir_wfd; +int pidfd = -1; struct bl_disk_path *bl_get_path(const char *filepath, struct bl_disk_path *paths) @@ -431,10 +433,20 @@ static int bl_event_helper(void) return ret; } +void sig_die(int signal) +{ + if (pidfd >= 0) { + close(pidfd); + unlink(PID_FILE); + } + BL_LOG_ERR("exit on signal(%d)\n", signal); + exit(1); +} + /* Daemon */ int main(int argc, char **argv) { - int pidfd = -1, opt, dflag = 0, fg = 0, ret = 1; + int opt, dflag = 0, fg = 0, ret = 1; struct stat statbuf; char pidbuf[64]; @@ -479,6 +491,10 @@ int main(int argc, char **argv) write(pidfd, pidbuf, strlen(pidbuf)); } + signal(SIGINT, sig_die); + signal(SIGTERM, sig_die); + signal(SIGHUP, SIG_IGN); + if (dflag) { bl_discover_devices(); exit(0);