Re: [PATCH v2 4/5] tools lib traceevent: Introduce pevent_strerror

[Steven Rostedt <rostedt@goodmis.org>]

On Mon, 2012-06-18 at 11:50 +0900, Namhyung Kim wrote:

> +	if (errnum <= __PEVENT_ERRNO__START ||
> +	    errnum >= __PEVENT_ERRNO__END)
> +		return -1;

OK, so you changed it to have both START and END be exclusive in the
range. No more 'MEM_ALLOC_FAILED = START'.

> +
> +	idx = errnum - __PEVENT_ERRNO__START;
> +	msg = pevent_error_str[idx];
> +
> +	switch (errnum) {
> +	case PEVENT_ERRNO__MEM_ALLOC_FAILED:
> +	case PEVENT_ERRNO__PARSE_EVENT_FAILED:
> +	case PEVENT_ERRNO__READ_ID_FAILED:
> +	case PEVENT_ERRNO__READ_FORMAT_FAILED:
> +	case PEVENT_ERRNO__READ_PRINT_FAILED:
> +	case PEVENT_ERRNO__OLD_FTRACE_ARG_FAILED:
> +		snprintf(buf, buflen, "%s", msg);
> +		break;
> +
> +	default:
> +		/* cannot reach here */
> +		break;
> +	}
> +
> +	return 0;
> +}
> +
>  int get_field_val(struct trace_seq *s, struct format_field *field,
>  		  const char *name, struct pevent_record *record,
>  		  unsigned long long *val, int err)
> diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
> index 24b7649d530b..a8121d78a046 100644
> --- a/tools/lib/traceevent/event-parse.h
> +++ b/tools/lib/traceevent/event-parse.h
> @@ -338,6 +338,16 @@ enum pevent_flag {
>  	PEVENT_NSEC_OUTPUT		= 1,	/* output in NSECS */
>  };
>  
> +#define PEVENT_ERRORS 							      \
> +	_PE(MEM_ALLOC_FAILED,	"failed to allocate memory"),		      \
> +	_PE(PARSE_EVENT_FAILED,	"failed to parse event"),		      \
> +	_PE(READ_ID_FAILED,	"failed to read event id"),		      \
> +	_PE(READ_FORMAT_FAILED,	"failed to read event format"),		      \
> +	_PE(READ_PRINT_FAILED,	"failed to read event print fmt"), 	      \
> +	_PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace")
> +
> +#undef _PE
> +#define _PE(__code, __str) PEVENT_ERRNO__ ## __code
>  enum pevent_errno {
>  	PEVENT_ERRNO__SUCCESS			= 0,
>  
> @@ -350,15 +360,11 @@ enum pevent_errno {
>  	 */
>  	__PEVENT_ERRNO__START			= -100000,
>  
> -	PEVENT_ERRNO__MEM_ALLOC_FAILED		= __PEVENT_ERRNO__START,
> -	PEVENT_ERRNO__PARSE_EVENT_FAILED,
> -	PEVENT_ERRNO__READ_ID_FAILED,
> -	PEVENT_ERRNO__READ_FORMAT_FAILED,
> -	PEVENT_ERRNO__READ_PRINT_FAILED,
> -	PEVENT_ERRNO__OLD_FTRACE_ARG_FAILED,
> +	PEVENT_ERRORS,
>  

Looks good.

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve

>  	__PEVENT_ERRNO__END,
>  };
> +#undef _PE
>  
>  struct cmdline;
>  struct cmdline_list;
> @@ -576,6 +582,8 @@ int pevent_data_pid(struct pevent *pevent, struct pevent_record *rec);
>  const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid);
>  void pevent_event_info(struct trace_seq *s, struct event_format *event,
>  		       struct pevent_record *record);
> +int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,
> +		    char *buf, size_t buflen);
>  
>  struct event_format **pevent_list_events(struct pevent *pevent, enum event_sort_type);
>  struct format_field **pevent_event_common_fields(struct event_format *event);