Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338911
b: refs/heads/master
c: 1f16c57
h: refs/heads/master
i:
  338909: d307481
  338907: cda8058
  338903: 191d186
  338895: 4c5eb4d
  338879: e7b0dad
v: v3
  • Loading branch information
Peter Zijlstra authored and Arnaldo Carvalho de Melo committed Oct 26, 2012
1 parent 04cf9ce commit c8644c3
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 7 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: 54a3cf59b53b3f01989a28344ecf4cb68217a6f6
refs/heads/master: 1f16c5754d3a4008c29f3bf67b4f1271313ba385
5 changes: 5 additions & 0 deletions trunk/tools/perf/Documentation/perf-stat.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ with it. --append may be used here. Examples:
3>results perf stat --log-fd 3 -- $cmd
3>>results perf stat --log-fd 3 --append -- $cmd

--pre::
--post::
Pre and post measurement hooks, e.g.:

perf stat --repeat 10 --null --sync --pre 'make -s O=defconfig-build/clean' -- make -s -j64 O=defconfig-build/ bzImage


EXAMPLES
Expand Down
42 changes: 36 additions & 6 deletions trunk/tools/perf/builtin-stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include "util/thread.h"
#include "util/thread_map.h"

#include <stdlib.h>
#include <sys/prctl.h>
#include <locale.h>

Expand All @@ -83,6 +84,9 @@ static const char *csv_sep = NULL;
static bool csv_output = false;
static bool group = false;
static FILE *output = NULL;
static const char *pre_cmd = NULL;
static const char *post_cmd = NULL;
static bool sync_run = false;

static volatile int done = 0;

Expand Down Expand Up @@ -265,7 +269,7 @@ static int read_counter(struct perf_evsel *counter)
return 0;
}

static int run_perf_stat(int argc __maybe_unused, const char **argv)
static int __run_perf_stat(int argc __maybe_unused, const char **argv)
{
unsigned long long t0, t1;
struct perf_evsel *counter, *first;
Expand Down Expand Up @@ -405,6 +409,32 @@ static int run_perf_stat(int argc __maybe_unused, const char **argv)
return WEXITSTATUS(status);
}

static int run_perf_stat(int argc __maybe_unused, const char **argv)
{
int ret;

if (pre_cmd) {
ret = system(pre_cmd);
if (ret)
return ret;
}

if (sync_run)
sync();

ret = __run_perf_stat(argc, argv);
if (ret)
return ret;

if (post_cmd) {
ret = system(post_cmd);
if (ret)
return ret;
}

return ret;
}

static void print_noise_pct(double total, double avg)
{
double pct = rel_stddev_stats(total, avg);
Expand Down Expand Up @@ -1069,8 +1099,7 @@ static int add_default_attributes(void)

int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
{
bool append_file = false,
sync_run = false;
bool append_file = false;
int output_fd = 0;
const char *output_name = NULL;
const struct option options[] = {
Expand Down Expand Up @@ -1114,6 +1143,10 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
OPT_BOOLEAN(0, "append", &append_file, "append to the output file"),
OPT_INTEGER(0, "log-fd", &output_fd,
"log output to fd, instead of stderr"),
OPT_STRING(0, "pre", &pre_cmd, "command",
"command to run prior to the measured command"),
OPT_STRING(0, "post", &post_cmd, "command",
"command to run after to the measured command"),
OPT_END()
};
const char * const stat_usage[] = {
Expand Down Expand Up @@ -1238,9 +1271,6 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
fprintf(output, "[ perf stat: executing run #%d ... ]\n",
run_idx + 1);

if (sync_run)
sync();

status = run_perf_stat(argc, argv);
}

Expand Down

0 comments on commit c8644c3

Please sign in to comment.