Commit 838d1452 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf tools: Fine tune readn function

Added a 'left' variable to make the flow clearer, and added a debug
check for the return value - returning 'n' is more obvious.

Added small comment for readn.
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Original-patch-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1385634619-8129-4-git-send-email-jolsa@redhat.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 727ebd54
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <linux/kernel.h>
/* /*
* XXX We need to find a better place for these things... * XXX We need to find a better place for these things...
...@@ -151,21 +152,26 @@ unsigned long convert_unit(unsigned long value, char *unit) ...@@ -151,21 +152,26 @@ unsigned long convert_unit(unsigned long value, char *unit)
return value; return value;
} }
/*
* Read exactly 'n' bytes or return an error.
*/
ssize_t readn(int fd, void *buf, size_t n) ssize_t readn(int fd, void *buf, size_t n)
{ {
void *buf_start = buf; void *buf_start = buf;
size_t left = n;
while (n) { while (left) {
ssize_t ret = read(fd, buf, n); ssize_t ret = read(fd, buf, left);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
n -= ret; left -= ret;
buf += ret; buf += ret;
} }
return buf - buf_start; BUG_ON((size_t)(buf - buf_start) != n);
return n;
} }
size_t hex_width(u64 v) size_t hex_width(u64 v)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment