668fe01f1c
Some of the util functions of libtraceevent.a conflict with perf, such as die(), warning() and others. Move them into event-util.h that is not included by the perf tools. Also, as perf compiles with 'bool' the filter_arg->bool needs to be renamed to filter_arg->boolean. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Arun Sharma <asharma@fb.com> Cc: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
81 lines
1.9 KiB
C
81 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License (not later!)
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*/
|
|
#ifndef __UTIL_H
|
|
#define __UTIL_H
|
|
|
|
#include <ctype.h>
|
|
|
|
/* Can be overridden */
|
|
void die(const char *fmt, ...);
|
|
void *malloc_or_die(unsigned int size);
|
|
void warning(const char *fmt, ...);
|
|
void pr_stat(const char *fmt, ...);
|
|
void vpr_stat(const char *fmt, va_list ap);
|
|
|
|
/* Always available */
|
|
void __die(const char *fmt, ...);
|
|
void __warning(const char *fmt, ...);
|
|
void __pr_stat(const char *fmt, ...);
|
|
|
|
void __vdie(const char *fmt, ...);
|
|
void __vwarning(const char *fmt, ...);
|
|
void __vpr_stat(const char *fmt, ...);
|
|
|
|
static inline char *strim(char *string)
|
|
{
|
|
char *ret;
|
|
|
|
if (!string)
|
|
return NULL;
|
|
while (*string) {
|
|
if (!isspace(*string))
|
|
break;
|
|
string++;
|
|
}
|
|
ret = string;
|
|
|
|
string = ret + strlen(ret) - 1;
|
|
while (string > ret) {
|
|
if (!isspace(*string))
|
|
break;
|
|
string--;
|
|
}
|
|
string[1] = 0;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int has_text(const char *text)
|
|
{
|
|
if (!text)
|
|
return 0;
|
|
|
|
while (*text) {
|
|
if (!isspace(*text))
|
|
return 1;
|
|
text++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|