Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe78ada authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf target: Introduce perf_target__parse_uid() 



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

Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Reviewed-by: default avatarDavid 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 60bbddaa

tools/perf/builtin-record.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

tools/perf/builtin-top.c

+1 −2
Original line number Diff line number Diff line
@@ -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 &&

tools/perf/util/target.c

+35 −0
Original line number Diff line number Diff line
@@ -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;

}

tools/perf/util/target.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */

tools/perf/util/usage.c

+0 −31
Original line number Diff line number Diff line
@@ -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;

}