Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221805
b: refs/heads/master
c: bca647a
h: refs/heads/master
i:
  221803: 335f09e
v: v3
  • Loading branch information
Tom Zanussi committed Nov 10, 2010
1 parent fce6da7 commit 8d382b1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: b0b6d914e2b7e0a736635515e87be718050c17c8
refs/heads/master: bca647aac5067fec8dfcbf8ddb79a4c0d5afdfdd
10 changes: 5 additions & 5 deletions trunk/tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ static const char * const record_usage[] = {

static bool force, append_file;

static const struct option options[] = {
const struct option record_options[] = {
OPT_CALLBACK('e', "event", NULL, "event",
"event selector. use 'perf list' to list available events",
parse_events),
Expand Down Expand Up @@ -839,16 +839,16 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
{
int i, j, err = -ENOMEM;

argc = parse_options(argc, argv, options, record_usage,
argc = parse_options(argc, argv, record_options, record_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc && target_pid == -1 && target_tid == -1 &&
!system_wide && !cpu_list)
usage_with_options(record_usage, options);
usage_with_options(record_usage, record_options);

if (force && append_file) {
fprintf(stderr, "Can't overwrite and append at the same time."
" You need to choose between -f and -A");
usage_with_options(record_usage, options);
usage_with_options(record_usage, record_options);
} else if (append_file) {
write_mode = WRITE_APPEND;
} else {
Expand All @@ -871,7 +871,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
if (thread_num <= 0) {
fprintf(stderr, "Can't find all threads of pid %d\n",
target_pid);
usage_with_options(record_usage, options);
usage_with_options(record_usage, record_options);
}
} else {
all_tids=malloc(sizeof(pid_t));
Expand Down

0 comments on commit 8d382b1

Please sign in to comment.