Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218684
b: refs/heads/master
c: b44308f
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Oct 26, 2010
1 parent 7726031 commit efc4e84
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0ab7368f8dad561b6164b3e942cab00f9565bd37
refs/heads/master: b44308f54062a4c1dee2602946f481f03739b76d
4 changes: 4 additions & 0 deletions trunk/tools/perf/Documentation/perf-record.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ OPTIONS
--call-graph::
Do call-graph (stack chain/backtrace) recording.

-q::
--quiet::
Don't print any message, useful for scripting.

-v::
--verbose::
Be more verbose (show counter open errors, etc).
Expand Down
4 changes: 4 additions & 0 deletions trunk/tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,9 @@ static int __cmd_record(int argc, const char **argv)
}
}

if (quiet)
return 0;

fprintf(stderr, "[ perf record: Woken up %ld times to write data ]\n", waking);

/*
Expand Down Expand Up @@ -820,6 +823,7 @@ static const struct option options[] = {
"do call-graph (stack chain/backtrace) recording"),
OPT_INCR('v', "verbose", &verbose,
"be more verbose (show counter open errors, etc)"),
OPT_BOOLEAN('q', "quiet", &quiet, "don't print any message"),
OPT_BOOLEAN('s', "stat", &inherit_stat,
"per thread counts"),
OPT_BOOLEAN('d', "data", &sample_address,
Expand Down
9 changes: 5 additions & 4 deletions trunk/tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,13 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
dup2(live_pipe[1], 1);
close(live_pipe[0]);

__argv = malloc(5 * sizeof(const char *));
__argv = malloc(6 * sizeof(const char *));
__argv[0] = "/bin/sh";
__argv[1] = record_script_path;
__argv[2] = "-o";
__argv[3] = "-";
__argv[4] = NULL;
__argv[2] = "-q";
__argv[3] = "-o";
__argv[4] = "-";
__argv[5] = NULL;

execvp("/bin/sh", (char **)__argv);
exit(-1);
Expand Down
4 changes: 2 additions & 2 deletions trunk/tools/perf/util/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "debug.h"
#include "util.h"

int verbose = 0;
bool dump_trace = false;
int verbose;
bool dump_trace = false, quiet = false;

int eprintf(int level, const char *fmt, ...)
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/tools/perf/util/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "event.h"

extern int verbose;
extern bool dump_trace;
extern bool quiet, dump_trace;

int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
void trace_event(event_t *event);
Expand Down

0 comments on commit efc4e84

Please sign in to comment.