From 90761053ef8e98a57de4540e5b38e63875c33b23 Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Fri, 22 Jan 2021 10:25:22 +0100
Subject: [PATCH] scripts/nvmf_perf: stop pcm-memory using sigterm

Use terminate() instead of kill() to exit more gracefully.
Using kill() resulted in (sometimes) output not being saved.

Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Change-Id: I3ff1dec8cb0804f6e0674c5ed61bbe4ec9ea70ef
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6045
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 scripts/perf/nvmf/run_nvmf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py
index 992d93053..e467955d3 100755
--- a/scripts/perf/nvmf/run_nvmf.py
+++ b/scripts/perf/nvmf/run_nvmf.py
@@ -268,7 +268,7 @@ class Target(Server):
         pcm_memory = subprocess.Popen("%s/pcm-memory.x %s -csv=%s/%s" % (self.pcm_dir, self.pcm_interval,
                                       results_dir, pcm_file_name), shell=True)
         time.sleep(self.pcm_count)
-        pcm_memory.kill()
+        pcm_memory.terminate()
 
     def measure_pcm(self, results_dir, pcm_file_name):
         time.sleep(self.pcm_delay)