diff options
| author |   He Zhe <zhe.he@windriver.com> | 2021-01-22 18:16:52 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-01-25 14:34:06 -0800 |
| commit | 36b25ecd9459f9f89c772eb4076eb6209424774c (patch) | |
| tree | 49f2c3641306cc890692bd5a2636d52e6ac628c3 /meta-oe/recipes-benchmark | |
| parent | 51614ac65121b962976ae366da7f07748e0784f8 (diff) | |
| download | meta-openembedded-36b25ecd9459f9f89c772eb4076eb6209424774c.tar.gz | |
lmbench: lat_fifo: Fix cleanup sequence
Files should be unlinked after all users exit. Otherwise we might experience
(w) read/write on pipe: No such file or directory
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
| -rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch new file mode 100644 index 0000000000..42b14cecee --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch @@ -0,0 +1,42 @@ +From 78912c0ac5e090095a2f2bd6226e02cce949e72e Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 22 Jan 2021 10:03:38 +0000 +Subject: [PATCH] lat_fifo: Fix cleanup sequence + +Files should be unlinked after all users exit. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + src/lat_fifo.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lat_fifo.c b/src/lat_fifo.c +index c625161..85bb9d1 100644 +--- a/src/lat_fifo.c ++++ b/src/lat_fifo.c +@@ -120,16 +120,16 @@ cleanup(iter_t iterations, void * cookie) + + if (iterations) return; + +- unlink(state->filename1); +- unlink(state->filename2); +- close(state->wr); +- close(state->rd); +- + if (state->pid > 0) { +- kill(state->pid, 15); ++ kill(state->pid, SIGKILL); + waitpid(state->pid, NULL, 0); + state->pid = 0; + } ++ ++ unlink(state->filename1); ++ unlink(state->filename2); ++ close(state->wr); ++ close(state->rd); + } + + void +-- +2.29.2 + diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 68c7e7b4fa..21e81ecf2b 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -28,6 +28,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ file://0001-lmbench-Point-webpage-lm-to-target-directory.patch \ file://0001-doc-Fix-typos-in-manual-pages.patch \ + file://0001-lat_fifo-Fix-cleanup-sequence.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" |