* [PATCH v2 mtd-utils] ubi-tests: io_paral: Fix error handling of update_volume()
@ 2018-09-05 13:47 Martin Lund
2018-09-08 16:52 ` David Oberhollenzer
0 siblings, 1 reply; 2+ messages in thread
From: Martin Lund @ 2018-09-05 13:47 UTC (permalink / raw)
To: linux-mtd
The io_paral test returns success even in case it throws e.g. the
following error message:
[io_paral] update_volume():125: written and read data are different
This patch fixes so that the io_paral application returns a non-zero
error code when an error is detected.
---
tests/ubi-tests/io_paral.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/tests/ubi-tests/io_paral.c b/tests/ubi-tests/io_paral.c
index b2b462e..da24b1b 100644
--- a/tests/ubi-tests/io_paral.c
+++ b/tests/ubi-tests/io_paral.c
@@ -24,6 +24,7 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <stdint.h>
#include <unistd.h>
#include <pthread.h>
#include <sys/types.h>
@@ -149,22 +150,22 @@ static void *update_thread(void *ptr)
if (ret) {
failed("ubi_rmvol");
errorm("cannot remove volume %d", vol_id);
- return NULL;
+ return (void *) -1;
}
ret = ubi_mkvol(libubi, node, &reqests[vol_id]);
if (ret) {
failed("ubi_mkvol");
errorm("cannot create volume %d", vol_id);
- return NULL;
+ return (void *) -1;
}
}
ret = update_volume(vol_id, bytes);
- if (ret)
- return NULL;
+ if (ret != 0)
+ return (void *) -1;
}
- return NULL;
+ return (void *) 0;
}
static void *write_thread(void *ptr)
@@ -179,7 +180,7 @@ static void *write_thread(void *ptr)
if (fd == -1) {
failed("open");
errorm("cannot open \"%s\"\n", vol_node);
- return NULL;
+ return (void *) -1;
}
ret = ubi_set_property(fd, UBI_VOL_PROP_DIRECT_WRITE, 1);
@@ -228,12 +229,13 @@ static void *write_thread(void *ptr)
}
close(fd);
- return NULL;
+ return (void *) 0;
}
int main(int argc, char * const argv[])
{
- int i, ret;
+ int i, ret, error=false;
+ intptr_t thread_ret;
pthread_t threads[THREADS_NUM];
if (initial_check(argc, argv))
@@ -301,8 +303,14 @@ int main(int argc, char * const argv[])
}
}
- for (i = 0; i < THREADS_NUM; i++)
- pthread_join(threads[i], NULL);
+ for (i = 0; i < THREADS_NUM; i++) {
+ pthread_join(threads[i], (void **) &thread_ret);
+ if (thread_ret != 0)
+ error = true;
+ }
+
+ if (error)
+ goto remove;
for (i = 0; i <= THREADS_NUM; i++) {
if (ubi_rmvol(libubi, node, i)) {
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 mtd-utils] ubi-tests: io_paral: Fix error handling of update_volume()
2018-09-05 13:47 [PATCH v2 mtd-utils] ubi-tests: io_paral: Fix error handling of update_volume() Martin Lund
@ 2018-09-08 16:52 ` David Oberhollenzer
0 siblings, 0 replies; 2+ messages in thread
From: David Oberhollenzer @ 2018-09-08 16:52 UTC (permalink / raw)
To: Martin Lund, linux-mtd
Applied to mtd-utils.git master.
Thanks,
David
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-08 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-05 13:47 [PATCH v2 mtd-utils] ubi-tests: io_paral: Fix error handling of update_volume() Martin Lund
2018-09-08 16:52 ` David Oberhollenzer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.