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

Commit 33058b94 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Jiri Olsa
Browse files

perf script: Move the number processing into its own function 



I was going to change something here and the result was so much on the
right side of the screen that I decided to move that piece into its own
function.
This patch should make no function change except the moving the code
into its own function.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/1401207274-8170-1-git-send-email-bigeasy@linutronix.de


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent d180ac14

tools/perf/util/scripting-engines/trace-event-python.c

+23 −15
Original line number Diff line number Diff line
@@ -231,6 +231,28 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel) 
	return event;

}



static PyObject *get_field_numeric_entry(struct event_format *event,

		struct format_field *field, void *data)

{

	PyObject *obj;

	unsigned long long val;



	val = read_size(event, data + field->offset, field->size);

	if (field->flags & FIELD_IS_SIGNED) {

		if ((long long)val >= LONG_MIN &&

				(long long)val <= LONG_MAX)

			obj = PyInt_FromLong(val);

		else

			obj = PyLong_FromLongLong(val);

	} else {

		if (val <= LONG_MAX)

			obj = PyInt_FromLong(val);

		else

			obj = PyLong_FromUnsignedLongLong(val);

	}

	return obj;

}



static void python_process_tracepoint(struct perf_sample *sample,

				      struct perf_evsel *evsel,

				      struct thread *thread,
@@ -239,7 +261,6 @@ static void python_process_tracepoint(struct perf_sample *sample, 
	PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;

	static char handler_name[256];

	struct format_field *field;

	unsigned long long val;

	unsigned long s, ns;

	struct event_format *event;

	unsigned n = 0;
@@ -303,20 +324,7 @@ static void python_process_tracepoint(struct perf_sample *sample, 
				offset = field->offset;

			obj = PyString_FromString((char *)data + offset);

		} else { /* FIELD_IS_NUMERIC */

			val = read_size(event, data + field->offset,

					field->size);

			if (field->flags & FIELD_IS_SIGNED) {

				if ((long long)val >= LONG_MIN &&

				    (long long)val <= LONG_MAX)

					obj = PyInt_FromLong(val);

				else

					obj = PyLong_FromLongLong(val);

			} else {

				if (val <= LONG_MAX)

					obj = PyInt_FromLong(val);

				else

					obj = PyLong_FromUnsignedLongLong(val);

			}

			obj = get_field_numeric_entry(event, field, data);

		}

		if (handler)

			PyTuple_SetItem(t, n++, obj);