Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf target: Introduce perf_target__parse_uid()

Browse source 
Add and use the modern perf_target__parse_uid() and get rid of the old
parse_target_uid().

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1336367344-28071-5-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2012-05-07 14:09:01 +09:00 committed by Arnaldo Carvalho de Melo
parent 60bbddaaa3
commit dfe78adaac
6 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/perf/builtin-record.c
View file

@ -886,9 +886,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
perf_target__validate(&rec->opts.target);
rec->opts.target.uid = parse_target_uid(rec->opts.target.uid_str);
if (rec->opts.target.uid_str != NULL &&
rec->opts.target.uid == UINT_MAX - 1)
if (perf_target__parse_uid(&rec->opts.target) < 0)
goto out_free_fd;
if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0)

3
tools/perf/builtin-top.c
View file

@ -1254,8 +1254,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
perf_target__validate(&top.target);
top.target.uid = parse_target_uid(top.target.uid_str);
if (top.target.uid_str != NULL && top.target.uid == UINT_MAX - 1)
if (perf_target__parse_uid(&top.target) < 0)
goto out_delete_evlist;
if (top.target.tid == 0 && top.target.pid == 0 &&

35
tools/perf/util/target.c
View file

@ -9,6 +9,8 @@
#include "target.h"
#include "debug.h"
#include <pwd.h>
enum perf_target_errno perf_target__validate(struct perf_target *target)
{
@ -54,3 +56,36 @@ enum perf_target_errno perf_target__validate(struct perf_target *target)
return ret;
}
enum perf_target_errno perf_target__parse_uid(struct perf_target *target)
{
struct passwd pwd, *result;
char buf[1024];
const char *str = target->uid_str;
target->uid = UINT_MAX;
if (str == NULL)
return PERF_ERRNO_TARGET__SUCCESS;
/* Try user name first */
getpwnam_r(str, &pwd, buf, sizeof(buf), &result);
if (result == NULL) {
/*
* The user name not found. Maybe it's a UID number.
*/
char *endptr;
int uid = strtol(str, &endptr, 10);
if (*endptr != '\0')
return PERF_ERRNO_TARGET__INVALID_UID;
getpwuid_r(uid, &pwd, buf, sizeof(buf), &result);
if (result == NULL)
return PERF_ERRNO_TARGET__USER_NOT_FOUND;
}
target->uid = result->pw_uid;
return PERF_ERRNO_TARGET__SUCCESS;
}

5
tools/perf/util/target.h
View file

@ -33,9 +33,14 @@ enum perf_target_errno {
PERF_ERRNO_TARGET__PID_OVERRIDE_SYSTEM,
PERF_ERRNO_TARGET__UID_OVERRIDE_SYSTEM,
/* for perf_target__parse_uid() */
PERF_ERRNO_TARGET__INVALID_UID,
PERF_ERRNO_TARGET__USER_NOT_FOUND,
__PERF_ERRNO_TARGET__END,
};
enum perf_target_errno perf_target__validate(struct perf_target *target);
enum perf_target_errno perf_target__parse_uid(struct perf_target *target);
#endif /* _PERF_TARGET_H */

31
tools/perf/util/usage.c
View file

@ -82,34 +82,3 @@ void warning(const char *warn, ...)
warn_routine(warn, params);
va_end(params);
}
uid_t parse_target_uid(const char *str)
{
struct passwd pwd, *result;
char buf[1024];
if (str == NULL)
return UINT_MAX;
getpwnam_r(str, &pwd, buf, sizeof(buf), &result);
if (result == NULL) {
char *endptr;
int uid = strtol(str, &endptr, 10);
if (*endptr != '\0') {
ui__error("Invalid user %s\n", str);
return UINT_MAX - 1;
}
getpwuid_r(uid, &pwd, buf, sizeof(buf), &result);
if (result == NULL) {
ui__error("Problems obtaining information for user %s\n",
str);
return UINT_MAX - 1;
}
}
return result->pw_uid;
}

3
tools/perf/util/util.h
View file

@ -74,7 +74,6 @@
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <pwd.h>
#include <inttypes.h>
#include "../../../include/linux/magic.h"
#include "types.h"
@ -249,8 +248,6 @@ struct perf_event_attr;
void event_attr_init(struct perf_event_attr *attr);
uid_t parse_target_uid(const char *str);
#define _STR(x) #x
#define STR(x) _STR(x)