leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Kill die()

Browse Source 
Finally can nuke this function, no more users.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-eivvvzn8ie6w42gy3batxoy7@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2017-06-27 11:49:13 -03:00
parent 25ce4bb8c5
commit fef2a73516
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/perf/tests/attr.c
View File

@@ -18,6 +18,7 @@
* permissions. All the event text files are stored there. * permissions. All the event text files are stored there.
*/ */
#include <debug.h>
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
@@ -29,14 +30,11 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "../perf.h" #include "../perf.h"
#include "util.h"
#include <subcmd/exec-cmd.h> #include <subcmd/exec-cmd.h>
#include "tests.h" #include "tests.h"
#define ENV "PERF_TEST_ATTR" #define ENV "PERF_TEST_ATTR"
extern int verbose;
static char *dir; static char *dir;
void test_attr__init(void) void test_attr__init(void)
@@ -138,8 +136,10 @@ void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
{ {
int errno_saved = errno; int errno_saved = errno;
if (store_event(attr, pid, cpu, fd, group_fd, flags)) if (store_event(attr, pid, cpu, fd, group_fd, flags)) {
die("test attr FAILED"); pr_err("test attr FAILED");
exit(128);
}
errno = errno_saved; errno = errno_saved;
} }

22
tools/perf/util/usage.c
View File

@@ -9,25 +9,12 @@
#include "util.h" #include "util.h"
#include "debug.h" #include "debug.h"
static void report(const char *prefix, const char *err, va_list params)
{
char msg[1024];
vsnprintf(msg, sizeof(msg), err, params);
fprintf(stderr, " %s%s\n", prefix, msg);
}
static __noreturn void usage_builtin(const char *err) static __noreturn void usage_builtin(const char *err)
{ {
fprintf(stderr, "\n Usage: %s\n", err); fprintf(stderr, "\n Usage: %s\n", err);
exit(129); exit(129);
} }
static __noreturn void die_builtin(const char *err, va_list params)
{
report(" Fatal: ", err, params);
exit(128);
}
/* If we are in a dlopen()ed .so write to a global variable would segfault /* If we are in a dlopen()ed .so write to a global variable would segfault
* (ugh), so keep things static. */ * (ugh), so keep things static. */
static void (*usage_routine)(const char *err) __noreturn = usage_builtin; static void (*usage_routine)(const char *err) __noreturn = usage_builtin;
@@ -36,12 +23,3 @@ void usage(const char *err)
{ {
usage_routine(err); usage_routine(err);
} }
void die(const char *err, ...)
{
va_list params;
va_start(params, err);
die_builtin(err, params);
va_end(params);
}