perf bench: Fix memory allocation fail check in mem{set,cpy} workloads
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Thu, 6 Jun 2013 11:35:03 +0000 (14:35 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 8 Jul 2013 20:35:40 +0000 (17:35 -0300)
Addresses of allocated memory areas saved to '*src' and '*dst', so we
need to check them for NULL, not 'src' and 'dst'.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1370518503-4230-1-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/bench/mem-memcpy.c
tools/perf/bench/mem-memset.c

index 93c83e3..25fd3f1 100644 (file)
@@ -111,11 +111,11 @@ static double timeval2double(struct timeval *ts)
 static void alloc_mem(void **dst, void **src, size_t length)
 {
        *dst = zalloc(length);
-       if (!dst)
+       if (!*dst)
                die("memory allocation failed - maybe length is too large?\n");
 
        *src = zalloc(length);
-       if (!src)
+       if (!*src)
                die("memory allocation failed - maybe length is too large?\n");
 }
 
index c6e4bc5..4a2f120 100644 (file)
@@ -111,7 +111,7 @@ static double timeval2double(struct timeval *ts)
 static void alloc_mem(void **dst, size_t length)
 {
        *dst = zalloc(length);
-       if (!dst)
+       if (!*dst)
                die("memory allocation failed - maybe length is too large?\n");
 }