2009-06-01 19:31:03 -06:00
|
|
|
#include "string.h"
|
2009-11-15 04:36:53 -07:00
|
|
|
#include "util.h"
|
2009-06-01 19:31:03 -06:00
|
|
|
|
|
|
|
static int hex(char ch)
|
|
|
|
{
|
|
|
|
if ((ch >= '0') && (ch <= '9'))
|
|
|
|
return ch - '0';
|
|
|
|
if ((ch >= 'a') && (ch <= 'f'))
|
|
|
|
return ch - 'a' + 10;
|
|
|
|
if ((ch >= 'A') && (ch <= 'F'))
|
|
|
|
return ch - 'A' + 10;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* While we find nice hex chars, build a long_val.
|
|
|
|
* Return number of chars processed.
|
|
|
|
*/
|
perf_counter tools: Define and use our own u64, s64 etc. definitions
On 64-bit powerpc, __u64 is defined to be unsigned long rather than
unsigned long long. This causes compiler warnings every time we
print a __u64 value with %Lx.
Rather than changing __u64, we define our own u64 to be unsigned long
long on all architectures, and similarly s64 as signed long long.
For consistency we also define u32, s32, u16, s16, u8 and s8. These
definitions are put in a new header, types.h, because these definitions
are needed in util/string.h and util/symbol.h.
The main change here is the mechanical change of __[us]{64,32,16,8}
to remove the "__". The other changes are:
* Create types.h
* Include types.h in perf.h, util/string.h and util/symbol.h
* Add types.h to the LIB_H definition in Makefile
* Added (u64) casts in process_overflow_event() and print_sym_table()
to kill two remaining warnings.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: benh@kernel.crashing.org
LKML-Reference: <19003.33494.495844.956580@cargo.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-06-19 06:21:42 -06:00
|
|
|
int hex2u64(const char *ptr, u64 *long_val)
|
2009-06-01 19:31:03 -06:00
|
|
|
{
|
|
|
|
const char *p = ptr;
|
|
|
|
*long_val = 0;
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
const int hex_val = hex(*p);
|
|
|
|
|
|
|
|
if (hex_val < 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
*long_val = (*long_val << 4) | hex_val;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return p - ptr;
|
|
|
|
}
|
2009-10-05 11:26:18 -06:00
|
|
|
|
|
|
|
char *strxfrchar(char *s, char from, char to)
|
|
|
|
{
|
|
|
|
char *p = s;
|
|
|
|
|
|
|
|
while ((p = strchr(p, from)) != NULL)
|
|
|
|
*p++ = to;
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
2009-11-15 04:36:53 -07:00
|
|
|
|
|
|
|
#define K 1024LL
|
|
|
|
/*
|
|
|
|
* perf_atoll()
|
|
|
|
* Parse (\d+)(b|B|kb|KB|mb|MB|gb|GB|tb|TB) (e.g. "256MB")
|
|
|
|
* and return its numeric value
|
|
|
|
*/
|
|
|
|
s64 perf_atoll(const char *str)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
s64 length = -1, unit = 1;
|
|
|
|
|
|
|
|
if (!isdigit(str[0]))
|
|
|
|
goto out_err;
|
|
|
|
|
|
|
|
for (i = 1; i < strlen(str); i++) {
|
|
|
|
switch (str[i]) {
|
|
|
|
case 'B':
|
|
|
|
case 'b':
|
|
|
|
break;
|
|
|
|
case 'K':
|
|
|
|
if (str[i + 1] != 'B')
|
|
|
|
goto out_err;
|
|
|
|
else
|
|
|
|
goto kilo;
|
|
|
|
case 'k':
|
|
|
|
if (str[i + 1] != 'b')
|
|
|
|
goto out_err;
|
|
|
|
kilo:
|
|
|
|
unit = K;
|
|
|
|
break;
|
|
|
|
case 'M':
|
|
|
|
if (str[i + 1] != 'B')
|
|
|
|
goto out_err;
|
|
|
|
else
|
|
|
|
goto mega;
|
|
|
|
case 'm':
|
|
|
|
if (str[i + 1] != 'b')
|
|
|
|
goto out_err;
|
|
|
|
mega:
|
|
|
|
unit = K * K;
|
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
if (str[i + 1] != 'B')
|
|
|
|
goto out_err;
|
|
|
|
else
|
|
|
|
goto giga;
|
|
|
|
case 'g':
|
|
|
|
if (str[i + 1] != 'b')
|
|
|
|
goto out_err;
|
|
|
|
giga:
|
|
|
|
unit = K * K * K;
|
|
|
|
break;
|
|
|
|
case 'T':
|
|
|
|
if (str[i + 1] != 'B')
|
|
|
|
goto out_err;
|
|
|
|
else
|
|
|
|
goto tera;
|
|
|
|
case 't':
|
|
|
|
if (str[i + 1] != 'b')
|
|
|
|
goto out_err;
|
|
|
|
tera:
|
|
|
|
unit = K * K * K * K;
|
|
|
|
break;
|
|
|
|
case '\0': /* only specified figures */
|
|
|
|
unit = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (!isdigit(str[i]))
|
|
|
|
goto out_err;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
length = atoll(str) * unit;
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
out_err:
|
|
|
|
length = -1;
|
|
|
|
out:
|
|
|
|
return length;
|
|
|
|
}
|
2009-11-30 17:20:05 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper function for splitting a string into an argv-like array.
|
|
|
|
* originaly copied from lib/argv_split.c
|
|
|
|
*/
|
|
|
|
static const char *skip_sep(const char *cp)
|
|
|
|
{
|
|
|
|
while (*cp && isspace(*cp))
|
|
|
|
cp++;
|
|
|
|
|
|
|
|
return cp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *skip_arg(const char *cp)
|
|
|
|
{
|
|
|
|
while (*cp && !isspace(*cp))
|
|
|
|
cp++;
|
|
|
|
|
|
|
|
return cp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int count_argc(const char *str)
|
|
|
|
{
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
while (*str) {
|
|
|
|
str = skip_sep(str);
|
|
|
|
if (*str) {
|
|
|
|
count++;
|
|
|
|
str = skip_arg(str);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* argv_free - free an argv
|
|
|
|
* @argv - the argument vector to be freed
|
|
|
|
*
|
|
|
|
* Frees an argv and the strings it points to.
|
|
|
|
*/
|
|
|
|
void argv_free(char **argv)
|
|
|
|
{
|
|
|
|
char **p;
|
|
|
|
for (p = argv; *p; p++)
|
|
|
|
free(*p);
|
|
|
|
|
|
|
|
free(argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* argv_split - split a string at whitespace, returning an argv
|
|
|
|
* @str: the string to be split
|
|
|
|
* @argcp: returned argument count
|
|
|
|
*
|
|
|
|
* Returns an array of pointers to strings which are split out from
|
|
|
|
* @str. This is performed by strictly splitting on white-space; no
|
|
|
|
* quote processing is performed. Multiple whitespace characters are
|
|
|
|
* considered to be a single argument separator. The returned array
|
|
|
|
* is always NULL-terminated. Returns NULL on memory allocation
|
|
|
|
* failure.
|
|
|
|
*/
|
|
|
|
char **argv_split(const char *str, int *argcp)
|
|
|
|
{
|
|
|
|
int argc = count_argc(str);
|
|
|
|
char **argv = zalloc(sizeof(*argv) * (argc+1));
|
|
|
|
char **argvp;
|
|
|
|
|
|
|
|
if (argv == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (argcp)
|
|
|
|
*argcp = argc;
|
|
|
|
|
|
|
|
argvp = argv;
|
|
|
|
|
|
|
|
while (*str) {
|
|
|
|
str = skip_sep(str);
|
|
|
|
|
|
|
|
if (*str) {
|
|
|
|
const char *p = str;
|
|
|
|
char *t;
|
|
|
|
|
|
|
|
str = skip_arg(str);
|
|
|
|
|
|
|
|
t = strndup(p, str-p);
|
|
|
|
if (t == NULL)
|
|
|
|
goto fail;
|
|
|
|
*argvp++ = t;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*argvp = NULL;
|
|
|
|
|
|
|
|
out:
|
|
|
|
return argv;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
argv_free(argv);
|
|
|
|
return NULL;
|
|
|
|
}
|