tools lib traceevent: Changed return logic of trace_seq_printf() and trace_seq_vprintf() APIs (6d2d6fd7) · Commits · 戴 / test

In order to make libtraceevent into a proper library, its API should be straightforward. The trace_seq_printf() and trace_seq_vprintf() APIs have inconsistent returned values with the other trace_seq_* APIs. This path changes the return logic of trace_seq_printf() and trace_seq_vprintf() to return the number of printed characters, as the other trace_seq_* related APIs. Signed-off-by:

Tzvetomir Stoyanov <tstoyanov@vmware.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20181201040852.485792891@goodmis.org Signed-off-by:

Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/lib/traceevent/trace-seq.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -100,7 +100,8 @@ static void expand_buffer(struct trace_seq *s)
		* @fmt: printf format string
		*
		* It returns 0 if the trace oversizes the buffer's free
		* space, 1 otherwise.
		* space, the number of characters printed, or a negative
		* value in case of an error.
		*
		* The tracer may use either sequence operations or its own
		* copy to user routines. To simplify formating of a trace
		@@ -129,9 +130,10 @@ trace_seq_printf(struct trace_seq s, const char fmt, ...)
		goto try_again;
		}

		if (ret > 0)
		s->len += ret;

		return 1;
		return ret;
		}

		/**
		@@ -139,6 +141,10 @@ trace_seq_printf(struct trace_seq s, const char fmt, ...)
		* @s: trace sequence descriptor
		* @fmt: printf format string
		*
		* It returns 0 if the trace oversizes the buffer's free
		* space, the number of characters printed, or a negative
		* value in case of an error.
		* *
		* The tracer may use either sequence operations or its own
		* copy to user routines. To simplify formating of a trace
		* trace_seq_printf is used to store strings into a special
		@@ -163,9 +169,10 @@ trace_seq_vprintf(struct trace_seq s, const char fmt, va_list args)
		goto try_again;
		}

		if (ret > 0)
		s->len += ret;

		return len;
		return ret;
		}

		/**

Admin message