diff options
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 66 | 
1 files changed, 33 insertions, 33 deletions
| diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index 45484f0f7292..89cb887648f9 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -99,7 +99,7 @@ static void define_symbolic_value(const char *ev_name,  	LEAVE;  } -static void define_symbolic_values(struct print_flag_sym *field, +static void define_symbolic_values(struct tep_print_flag_sym *field,  				   const char *ev_name,  				   const char *field_name)  { @@ -157,7 +157,7 @@ static void define_flag_value(const char *ev_name,  	LEAVE;  } -static void define_flag_values(struct print_flag_sym *field, +static void define_flag_values(struct tep_print_flag_sym *field,  			       const char *ev_name,  			       const char *field_name)  { @@ -189,62 +189,62 @@ static void define_flag_field(const char *ev_name,  	LEAVE;  } -static void define_event_symbols(struct event_format *event, +static void define_event_symbols(struct tep_event_format *event,  				 const char *ev_name, -				 struct print_arg *args) +				 struct tep_print_arg *args)  {  	if (args == NULL)  		return;  	switch (args->type) { -	case PRINT_NULL: +	case TEP_PRINT_NULL:  		break; -	case PRINT_ATOM: +	case TEP_PRINT_ATOM:  		define_flag_value(ev_name, cur_field_name, "0",  				  args->atom.atom);  		zero_flag_atom = 0;  		break; -	case PRINT_FIELD: +	case TEP_PRINT_FIELD:  		free(cur_field_name);  		cur_field_name = strdup(args->field.name);  		break; -	case PRINT_FLAGS: +	case TEP_PRINT_FLAGS:  		define_event_symbols(event, ev_name, args->flags.field);  		define_flag_field(ev_name, cur_field_name, args->flags.delim);  		define_flag_values(args->flags.flags, ev_name, cur_field_name);  		break; -	case PRINT_SYMBOL: +	case TEP_PRINT_SYMBOL:  		define_event_symbols(event, ev_name, args->symbol.field);  		define_symbolic_field(ev_name, cur_field_name);  		define_symbolic_values(args->symbol.symbols, ev_name,  				       cur_field_name);  		break; -	case PRINT_HEX: -	case PRINT_HEX_STR: +	case TEP_PRINT_HEX: +	case TEP_PRINT_HEX_STR:  		define_event_symbols(event, ev_name, args->hex.field);  		define_event_symbols(event, ev_name, args->hex.size);  		break; -	case PRINT_INT_ARRAY: +	case TEP_PRINT_INT_ARRAY:  		define_event_symbols(event, ev_name, args->int_array.field);  		define_event_symbols(event, ev_name, args->int_array.count);  		define_event_symbols(event, ev_name, args->int_array.el_size);  		break; -	case PRINT_BSTRING: -	case PRINT_DYNAMIC_ARRAY: -	case PRINT_DYNAMIC_ARRAY_LEN: -	case PRINT_STRING: -	case PRINT_BITMASK: +	case TEP_PRINT_BSTRING: +	case TEP_PRINT_DYNAMIC_ARRAY: +	case TEP_PRINT_DYNAMIC_ARRAY_LEN: +	case TEP_PRINT_STRING: +	case TEP_PRINT_BITMASK:  		break; -	case PRINT_TYPE: +	case TEP_PRINT_TYPE:  		define_event_symbols(event, ev_name, args->typecast.item);  		break; -	case PRINT_OP: +	case TEP_PRINT_OP:  		if (strcmp(args->op.op, ":") == 0)  			zero_flag_atom = 1;  		define_event_symbols(event, ev_name, args->op.left);  		define_event_symbols(event, ev_name, args->op.right);  		break; -	case PRINT_FUNC: +	case TEP_PRINT_FUNC:  	default:  		pr_err("Unsupported print arg type\n");  		/* we should warn... */ @@ -338,8 +338,8 @@ static void perl_process_tracepoint(struct perf_sample *sample,  				    struct addr_location *al)  {  	struct thread *thread = al->thread; -	struct event_format *event = evsel->tp_format; -	struct format_field *field; +	struct tep_event_format *event = evsel->tp_format; +	struct tep_format_field *field;  	static char handler[256];  	unsigned long long val;  	unsigned long s, ns; @@ -388,9 +388,9 @@ static void perl_process_tracepoint(struct perf_sample *sample,  	/* common fields other than pid can be accessed via xsub fns */  	for (field = event->format.fields; field; field = field->next) { -		if (field->flags & FIELD_IS_STRING) { +		if (field->flags & TEP_FIELD_IS_STRING) {  			int offset; -			if (field->flags & FIELD_IS_DYNAMIC) { +			if (field->flags & TEP_FIELD_IS_DYNAMIC) {  				offset = *(int *)(data + field->offset);  				offset &= 0xffff;  			} else @@ -399,7 +399,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,  		} else { /* FIELD_IS_NUMERIC */  			val = read_size(event, data + field->offset,  					field->size); -			if (field->flags & FIELD_IS_SIGNED) { +			if (field->flags & TEP_FIELD_IS_SIGNED) {  				XPUSHs(sv_2mortal(newSViv(val)));  			} else {  				XPUSHs(sv_2mortal(newSVuv(val))); @@ -537,8 +537,8 @@ static int perl_stop_script(void)  static int perl_generate_script(struct tep_handle *pevent, const char *outfile)  { -	struct event_format *event = NULL; -	struct format_field *f; +	struct tep_event_format *event = NULL; +	struct tep_format_field *f;  	char fname[PATH_MAX];  	int not_first, count;  	FILE *ofp; @@ -646,11 +646,11 @@ sub print_backtrace\n\  			count++;  			fprintf(ofp, "%s=", f->name); -			if (f->flags & FIELD_IS_STRING || -			    f->flags & FIELD_IS_FLAG || -			    f->flags & FIELD_IS_SYMBOLIC) +			if (f->flags & TEP_FIELD_IS_STRING || +			    f->flags & TEP_FIELD_IS_FLAG || +			    f->flags & TEP_FIELD_IS_SYMBOLIC)  				fprintf(ofp, "%%s"); -			else if (f->flags & FIELD_IS_SIGNED) +			else if (f->flags & TEP_FIELD_IS_SIGNED)  				fprintf(ofp, "%%d");  			else  				fprintf(ofp, "%%u"); @@ -668,7 +668,7 @@ sub print_backtrace\n\  			if (++count % 5 == 0)  				fprintf(ofp, "\n\t       "); -			if (f->flags & FIELD_IS_FLAG) { +			if (f->flags & TEP_FIELD_IS_FLAG) {  				if ((count - 1) % 5 != 0) {  					fprintf(ofp, "\n\t       ");  					count = 4; @@ -678,7 +678,7 @@ sub print_backtrace\n\  					event->name);  				fprintf(ofp, "\"%s\", $%s)", f->name,  					f->name); -			} else if (f->flags & FIELD_IS_SYMBOLIC) { +			} else if (f->flags & TEP_FIELD_IS_SYMBOLIC) {  				if ((count - 1) % 5 != 0) {  					fprintf(ofp, "\n\t       ");  					count = 4; | 
