glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

count: use parse_ts for parsing overhead value

Browse Source 
* count.c (set_overhead): Change argument type to const char *, call
parse_ts to parse it and set to overhead.
* defs.h (set_overhead): Update declaration.
* strace.c: (init) <case 'O'>: do not parse argument, pass optarg to
set_overhead call.
* tests/count.test (GENERIC, WALLCLOCK, HALFCLOCK): New variables with
expected patterns.
Add checks for the new -O syntax.
This commit is contained in:
Eugene Syromyatnikov 2018-09-02 21:56:47 +02:00
parent 1a28b6dba2
commit 0a21612184
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
count.c
View File

@ -116,10 +116,11 @@ set_sortby(const char *sortby)
}
}
void set_overhead(int n)
void
set_overhead(const char *str)
{
overhead.tv_sec = n / 1000000;
overhead.tv_nsec = n % 1000000 * 1000;
if (parse_ts(str, &overhead) < 0)
error_msg_and_help("invalid -O argument: '%s'", str);
}
static void

2
defs.h
View File

@ -430,7 +430,7 @@ extern unsigned os_release;
extern int read_int_from_file(struct tcb *, const char *, int *);
extern void set_sortby(const char *);
extern void set_overhead(int);
extern void set_overhead(const char *);
extern void print_pc(struct tcb *);
extern int syscall_entering_decode(struct tcb *);

5
strace.c
View File

@ -1675,10 +1675,7 @@ init(int argc, char *argv[])
outfname = optarg;
break;
case 'O':
i = string_to_uint(optarg);
if (i < 0)
error_opt_arg(c, optarg);
set_overhead(i);
set_overhead(optarg);
break;
case 'p':
process_opt_p_list(optarg);

23
tests/count.test
View File

@ -49,13 +49,20 @@ grep_log()
}
}
grep_log ' *[^ ]+ +0\.0[^n]*nanosleep' -c
grep_log ' *[^ ]+ +0\.0[^n]*nanosleep' -c -O1
grep_log ' *[^ ]+ +0\.0[^n]*nanosleep' -c -enanosleep
grep_log ' *[^ ]+ +0\.0[^n]*nanosleep' -c -O1 -enanosleep
grep_log ' *[^ ]+ +(1\.[01]|0\.99)[^n]*nanosleep' -cw
grep_log ' *[^ ]+ +(1\.[01]|0\.99)[^n]*nanosleep' -cw -O1
grep_log '100\.00 +(1\.[01]|0\.99)[^n]*nanosleep' -cw -enanosleep
grep_log '100\.00 +(1\.[01]|0\.99)[^n]*nanosleep' -cw -O1 -enanosleep
GENERIC=' *[^ ]+ +0\.0[^n]*nanosleep *'
WALLCLOCK=' *[^ ]+ +(1\.[01]|0\.99)[^n]*nanosleep *'
HALFCLOCK=' *[^ ]+ +0\.[567][^n]*nanosleep *'
grep_log "$GENERIC" -c
grep_log "$GENERIC" -c -O1
grep_log "$GENERIC" -c -enanosleep
grep_log "$GENERIC" -c -O1 -enanosleep
grep_log "$WALLCLOCK" -cw
grep_log "$WALLCLOCK" -cw -O1
grep_log "$WALLCLOCK" -cw -enanosleep
grep_log "$WALLCLOCK" -cw -O1 -enanosleep
grep_log "$HALFCLOCK" -cw -O4.5e2ms -enanosleep
grep_log "$HALFCLOCK" -cw -O4.5e-1s -enanosleep
grep_log "$HALFCLOCK" -cw -O456789012ns -enanosleep
exit 0