Skip to content

Commit

Permalink
perf time-utils: Factor out set_percent_time()
Browse files Browse the repository at this point in the history
Factor out set_percent_time() so it can be reused.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190604130017.31207-14-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Adrian Hunter authored and Arnaldo Carvalho de Melo committed Jun 10, 2019
1 parent f79a768 commit c763242
Showing 1 changed file with 18 additions and 21 deletions.
39 changes: 18 additions & 21 deletions tools/perf/util/time-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,27 @@ static int parse_percent(double *pcnt, char *str)
return 0;
}

static int set_percent_time(struct perf_time_interval *ptime, double start_pcnt,
double end_pcnt, u64 start, u64 end)
{
u64 total = end - start;

if (start_pcnt < 0.0 || start_pcnt > 1.0 ||
end_pcnt < 0.0 || end_pcnt > 1.0) {
return -1;
}

ptime->start = start + round(start_pcnt * total);
ptime->end = start + round(end_pcnt * total);

return 0;
}

static int percent_slash_split(char *str, struct perf_time_interval *ptime,
u64 start, u64 end)
{
char *p, *end_str;
double pcnt, start_pcnt, end_pcnt;
u64 total = end - start;
int i;

/*
Expand Down Expand Up @@ -168,23 +183,14 @@ static int percent_slash_split(char *str, struct perf_time_interval *ptime,
start_pcnt = pcnt * (i - 1);
end_pcnt = pcnt * i;

if (start_pcnt < 0.0 || start_pcnt > 1.0 ||
end_pcnt < 0.0 || end_pcnt > 1.0) {
return -1;
}

ptime->start = start + round(start_pcnt * total);
ptime->end = start + round(end_pcnt * total);

return 0;
return set_percent_time(ptime, start_pcnt, end_pcnt, start, end);
}

static int percent_dash_split(char *str, struct perf_time_interval *ptime,
u64 start, u64 end)
{
char *start_str = NULL, *end_str;
double start_pcnt, end_pcnt;
u64 total = end - start;
int ret;

/*
Expand All @@ -203,16 +209,7 @@ static int percent_dash_split(char *str, struct perf_time_interval *ptime,

free(start_str);

if (start_pcnt < 0.0 || start_pcnt > 1.0 ||
end_pcnt < 0.0 || end_pcnt > 1.0 ||
start_pcnt > end_pcnt) {
return -1;
}

ptime->start = start + round(start_pcnt * total);
ptime->end = start + round(end_pcnt * total);

return 0;
return set_percent_time(ptime, start_pcnt, end_pcnt, start, end);
}

typedef int (*time_pecent_split)(char *, struct perf_time_interval *,
Expand Down

0 comments on commit c763242

Please sign in to comment.