Merged to master at 8b747b56bc28..f912b27ed4c5 (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/8b747b56bc28...f912b27ed4c5
On 2016-06-23 at 10:49 Barret Rhoden <[email protected]> wrote: > The old version worked if you ssh'd in, but not if we were directly on > the console. Actually, I shouldn't have bothered with fdopen() in the > first place. > > Signed-off-by: Barret Rhoden <[email protected]> > --- > tools/dev-util/perf/perf.c | 4 ++-- > tools/dev-util/perf/xlib.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/dev-util/perf/perf.c b/tools/dev-util/perf/perf.c > index b6b3aa17482d..bd03a9f906fc 100644 > --- a/tools/dev-util/perf/perf.c > +++ b/tools/dev-util/perf/perf.c > @@ -361,14 +361,14 @@ static error_t parse_stat_opt(int key, char > *arg, struct argp_state *state) p_opts->stat_bignum = TRUE; > break; > case 'o': > - p_opts->outfile = xfopen(arg, "w+"); > + p_opts->outfile = xfopen(arg, "w"); > break; > case ARGP_KEY_END: > if (!p_opts->events) > p_opts->events = > "cache-misses,cache-references," > "branch-misses,branches,instructions,cycles"; if (!p_opts->outfile) > - p_opts->outfile = xfdopen(1, "w+"); > + p_opts->outfile = stdout; > break; > default: > return ARGP_ERR_UNKNOWN; > diff --git a/tools/dev-util/perf/xlib.c b/tools/dev-util/perf/xlib.c > index 897b68eb3b63..1eb83f58cdf7 100644 > --- a/tools/dev-util/perf/xlib.c > +++ b/tools/dev-util/perf/xlib.c > @@ -84,7 +84,7 @@ FILE *xfdopen(int fd, const char *mode) > FILE *file = fdopen(fd, mode); > > if (!file) { > - fprintf(stderr, "Unable to reopen fd '%d' for mode > '%s;: %s\n", fd, > + fprintf(stderr, "Unable to reopen fd '%d' for mode > '%s': %s\n", fd, mode, strerror(errno)); > exit(1); > } -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
