Patchwork [PATCHv2] tests/tcg: fix unused result warnings

login
register
mail settings
Submitter Catalin Patulea
Date Oct. 29, 2012, 6:01 p.m.
Message ID <1351533667-7669-1-git-send-email-catalinp@google.com>
Download mbox | patch
Permalink /patch/195098/
State New
Headers show

Comments

Catalin Patulea - Oct. 29, 2012, 6:01 p.m.
With i386-linux-user target on x86_64 host, this does not introduce any new test
failures.

Signed-off-by: Catalin Patulea <catalinp@google.com>
---
v2:
- Fixes style issues from checkpatch.pl
- For some reason, the patch from the list wouldn't apply for me onto master on
  a different machine. This grabs a new master from
  git://git.qemu.org/qemu.git. Let me know if there are any issues.

 tests/tcg/test-mmap.c  |   18 +++++++++++++-----
 tests/tcg/testthread.c |   11 +++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)
Blue Swirl - Oct. 30, 2012, 9:08 p.m.
Thanks, applied.

On Mon, Oct 29, 2012 at 6:01 PM, Catalin Patulea <catalinp@google.com> wrote:
> With i386-linux-user target on x86_64 host, this does not introduce any new test
> failures.
>
> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> v2:
> - Fixes style issues from checkpatch.pl
> - For some reason, the patch from the list wouldn't apply for me onto master on
>   a different machine. This grabs a new master from
>   git://git.qemu.org/qemu.git. Let me know if there are any issues.
>
>  tests/tcg/test-mmap.c  |   18 +++++++++++++-----
>  tests/tcg/testthread.c |   11 +++++++++--
>  2 files changed, 22 insertions(+), 7 deletions(-)
>
> diff --git a/tests/tcg/test-mmap.c b/tests/tcg/test-mmap.c
> index c418b67..3982fa2 100644
> --- a/tests/tcg/test-mmap.c
> +++ b/tests/tcg/test-mmap.c
> @@ -429,6 +429,12 @@ void check_file_fixed_mmaps(void)
>         fprintf (stderr, " passed\n");
>  }
>
> +void checked_write(int fd, const void *buf, size_t count)
> +{
> +    ssize_t rc = write(fd, buf, count);
> +    fail_unless(rc == count);
> +}
> +
>  int main(int argc, char **argv)
>  {
>         char tempname[] = "/tmp/.cmmapXXXXXX";
> @@ -450,13 +456,15 @@ int main(int argc, char **argv)
>         unlink(tempname);
>
>         /* Fill the file with int's counting from zero and up.  */
> -       for (i = 0; i < (pagesize * 4) / sizeof i; i++)
> -               write (test_fd, &i, sizeof i);
> +    for (i = 0; i < (pagesize * 4) / sizeof i; i++) {
> +        checked_write(test_fd, &i, sizeof i);
> +    }
> +
>         /* Append a few extra writes to make the file end at non
>            page boundary.  */
> -       write (test_fd, &i, sizeof i); i++;
> -       write (test_fd, &i, sizeof i); i++;
> -       write (test_fd, &i, sizeof i); i++;
> +    checked_write(test_fd, &i, sizeof i); i++;
> +    checked_write(test_fd, &i, sizeof i); i++;
> +    checked_write(test_fd, &i, sizeof i); i++;
>
>         test_fsize = lseek(test_fd, 0, SEEK_CUR);
>
> diff --git a/tests/tcg/testthread.c b/tests/tcg/testthread.c
> index 27e4825..2679af1 100644
> --- a/tests/tcg/testthread.c
> +++ b/tests/tcg/testthread.c
> @@ -1,3 +1,4 @@
> +#include <assert.h>
>  #include <stdlib.h>
>  #include <stdio.h>
>  #include <string.h>
> @@ -8,6 +9,12 @@
>  #include <sys/wait.h>
>  #include <sched.h>
>
> +void checked_write(int fd, const void *buf, size_t count)
> +{
> +    ssize_t rc = write(fd, buf, count);
> +    assert(rc == count);
> +}
> +
>  void *thread1_func(void *arg)
>  {
>      int i;
> @@ -15,7 +22,7 @@ void *thread1_func(void *arg)
>
>      for(i=0;i<10;i++) {
>          snprintf(buf, sizeof(buf), "thread1: %d %s\n", i, (char *)arg);
> -        write(1, buf, strlen(buf));
> +        checked_write(1, buf, strlen(buf));
>          usleep(100 * 1000);
>      }
>      return NULL;
> @@ -27,7 +34,7 @@ void *thread2_func(void *arg)
>      char buf[512];
>      for(i=0;i<20;i++) {
>          snprintf(buf, sizeof(buf), "thread2: %d %s\n", i, (char *)arg);
> -        write(1, buf, strlen(buf));
> +        checked_write(1, buf, strlen(buf));
>          usleep(150 * 1000);
>      }
>      return NULL;
> --
> 1.7.7.3
>
>

Patch

diff --git a/tests/tcg/test-mmap.c b/tests/tcg/test-mmap.c
index c418b67..3982fa2 100644
--- a/tests/tcg/test-mmap.c
+++ b/tests/tcg/test-mmap.c
@@ -429,6 +429,12 @@  void check_file_fixed_mmaps(void)
 	fprintf (stderr, " passed\n");
 }
 
+void checked_write(int fd, const void *buf, size_t count)
+{
+    ssize_t rc = write(fd, buf, count);
+    fail_unless(rc == count);
+}
+
 int main(int argc, char **argv)
 {
 	char tempname[] = "/tmp/.cmmapXXXXXX";
@@ -450,13 +456,15 @@  int main(int argc, char **argv)
 	unlink(tempname);
 
 	/* Fill the file with int's counting from zero and up.  */
-	for (i = 0; i < (pagesize * 4) / sizeof i; i++)
-		write (test_fd, &i, sizeof i);
+    for (i = 0; i < (pagesize * 4) / sizeof i; i++) {
+        checked_write(test_fd, &i, sizeof i);
+    }
+
 	/* Append a few extra writes to make the file end at non 
 	   page boundary.  */
-	write (test_fd, &i, sizeof i); i++;
-	write (test_fd, &i, sizeof i); i++;
-	write (test_fd, &i, sizeof i); i++;
+    checked_write(test_fd, &i, sizeof i); i++;
+    checked_write(test_fd, &i, sizeof i); i++;
+    checked_write(test_fd, &i, sizeof i); i++;
 
 	test_fsize = lseek(test_fd, 0, SEEK_CUR);
 
diff --git a/tests/tcg/testthread.c b/tests/tcg/testthread.c
index 27e4825..2679af1 100644
--- a/tests/tcg/testthread.c
+++ b/tests/tcg/testthread.c
@@ -1,3 +1,4 @@ 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -8,6 +9,12 @@ 
 #include <sys/wait.h>
 #include <sched.h>
 
+void checked_write(int fd, const void *buf, size_t count)
+{
+    ssize_t rc = write(fd, buf, count);
+    assert(rc == count);
+}
+
 void *thread1_func(void *arg)
 {
     int i;
@@ -15,7 +22,7 @@  void *thread1_func(void *arg)
 
     for(i=0;i<10;i++) {
         snprintf(buf, sizeof(buf), "thread1: %d %s\n", i, (char *)arg);
-        write(1, buf, strlen(buf));
+        checked_write(1, buf, strlen(buf));
         usleep(100 * 1000);
     }
     return NULL;
@@ -27,7 +34,7 @@  void *thread2_func(void *arg)
     char buf[512];
     for(i=0;i<20;i++) {
         snprintf(buf, sizeof(buf), "thread2: %d %s\n", i, (char *)arg);
-        write(1, buf, strlen(buf));
+        checked_write(1, buf, strlen(buf));
         usleep(150 * 1000);
     }
     return NULL;