From eb6abcf10550ef544d427d6709b0894acb622845 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Aug 23 2012 14:53:42 +0000
Subject: daemon: use helper for examine request kill


This kill() call was missed when moving kill to
the helper in 5c51530b5bccb8cfadc8a8591558b9ab99b95cb3

Signed-off-by: David Teigland <teigland@redhat.com>

---

diff --git a/src/resource.c b/src/resource.c
index 4ad4a05..7208d92 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -31,6 +31,7 @@
 #include "resource.h"
 #include "task.h"
 #include "mode_block.h"
+#include "helper.h"
 
 /* from cmd.c */
 void send_state_resource(int fd, struct resource *r, const char *list_name, int pid, uint32_t token_id);
@@ -812,9 +813,10 @@ static int examine_token(struct task *task, struct token *token,
 
 static void do_req_kill_pid(struct token *tt, int pid)
 {
+	struct helper_msg hm;
 	struct resource *r;
 	uint32_t flags;
-	int found = 0;
+	int rv, found = 0;
 
 	pthread_mutex_lock(&resource_mutex);
 	r = find_resource(tt, &resources_held);
@@ -833,16 +835,29 @@ static void do_req_kill_pid(struct token *tt, int pid)
 	log_debug("do_req_kill_pid %d flags %x %.48s:%.48s",
 		  pid, flags, tt->r.lockspace_name, tt->r.name);
 
-	/* TODO: share code with kill_pids() to gradually
-	 * escalate from killscript, SIGTERM, SIGKILL */
+	if (helper_kill_fd == -1) {
+		log_error("do_req_kill_pid %d no helper fd", pid);
+		return;
+	}
+
+	/* TODO: handle kill via runpath? or select signal? escalate? */
 
-	kill(pid, SIGTERM);
+	memset(&hm, 0, sizeof(hm));
+	hm.type = HELPER_MSG_KILLPID;
+	hm.pid = pid;
+	hm.sig = SIGKILL;
 
 	if (flags & R_RESTRICT_SIGKILL)
-		return;
+		hm.sig = SIGTERM;
+
+ retry:
+	rv = write(helper_kill_fd, &hm, sizeof(hm));
+	if (rv == -1 && errno == EINTR)
+		goto retry;
 
-	sleep(1);
-	kill(pid, SIGKILL);
+	if (rv == -1)
+		log_error("do_req_kill_pid %d helper write error %d",
+			  pid, errno);
 }
 
 int set_resource_examine(char *space_name, char *res_name)