| Message ID | 20190814084712.28188-8-tz.stoyanov@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Steven Rostedt |
| Headers | show |
| Series | Separate trace-cmd and libtracecmd code | expand |
On Wed, 14 Aug 2019 11:47:07 +0300 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > These APIs depend on trace-cmd context and cannot be used standalone: > tracecmd_create_top_instance() > tracecmd_remove_instances() > tracecmd_filter_pid() > tracecmd_add_event() > tracecmd_enable_events() > tracecmd_disable_all_tracing() > tracecmd_disable_tracing() > tracecmd_enable_tracing() > tracecmd_stat_cpu() > They are implemented in trace-cmd application, but declared as APIs in > trace-cmd.h. The declarations are moved from trace-cmd.h to trace-local.h, > local header file visible only to trace-cmd application. > > Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> > --- > include/trace-cmd/trace-cmd.h | 9 --------- > tracecmd/include/trace-local.h | 11 +++++++++++ > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h > index 8db0686..2c8d798 100644 > --- a/include/trace-cmd/trace-cmd.h > +++ b/include/trace-cmd/trace-cmd.h > @@ -137,8 +137,6 @@ int tracecmd_buffer_instances(struct tracecmd_input *handle); > const char *tracecmd_buffer_instance_name(struct tracecmd_input *handle, int indx); > struct tracecmd_input *tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx); > int tracecmd_is_buffer_instance(struct tracecmd_input *handle); > -void tracecmd_create_top_instance(char *name); > -void tracecmd_remove_instances(void); > > void tracecmd_set_ts_offset(struct tracecmd_input *handle, unsigned long long offset); > void tracecmd_set_ts2secs(struct tracecmd_input *handle, unsigned long long hz); > @@ -304,14 +302,7 @@ struct tracecmd_recorder *tracecmd_create_buffer_recorder_maxkb(const char *file > > int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep); > void tracecmd_stop_recording(struct tracecmd_recorder *recorder); > -void tracecmd_stat_cpu(struct trace_seq *s, int cpu); > long tracecmd_flush_recording(struct tracecmd_recorder *recorder); > -void tracecmd_filter_pid(int pid, int exclude); > -int tracecmd_add_event(const char *event_str, int stack); > -void tracecmd_enable_events(void); > -void tracecmd_disable_all_tracing(int disable_tracer); > -void tracecmd_disable_tracing(void); > -void tracecmd_enable_tracing(void); > > enum tracecmd_msg_flags { > TRACECMD_MSG_FL_USE_TCP = 1 << 0, > diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h > index e2d5506..05760d8 100644 > --- a/tracecmd/include/trace-local.h > +++ b/tracecmd/include/trace-local.h > @@ -216,6 +216,17 @@ void show_instance_file(struct buffer_instance *instance, const char *name); > > int count_cpus(void); > > +/* moved from trace-cmd.h */ > +void tracecmd_create_top_instance(char *name); > +void tracecmd_remove_instances(void); > +void tracecmd_filter_pid(int pid, int exclude); > +int tracecmd_add_event(const char *event_str, int stack); > +void tracecmd_enable_events(void); > +void tracecmd_disable_all_tracing(int disable_tracer); > +void tracecmd_disable_tracing(void); > +void tracecmd_enable_tracing(void); > +void tracecmd_stat_cpu(struct trace_seq *s, int cpu); > + I'll take this patch, but I wonder if we should change "tracecmd_" to "trace_" to let it be known that these are local functions. That can be a later patch. -- Steve > /* No longer in event-utils.h */ > void __noreturn die(const char *fmt, ...); /* Can be overriden */ > void *malloc_or_die(unsigned int size); /* Can be overridden */
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 8db0686..2c8d798 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -137,8 +137,6 @@ int tracecmd_buffer_instances(struct tracecmd_input *handle); const char *tracecmd_buffer_instance_name(struct tracecmd_input *handle, int indx); struct tracecmd_input *tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx); int tracecmd_is_buffer_instance(struct tracecmd_input *handle); -void tracecmd_create_top_instance(char *name); -void tracecmd_remove_instances(void); void tracecmd_set_ts_offset(struct tracecmd_input *handle, unsigned long long offset); void tracecmd_set_ts2secs(struct tracecmd_input *handle, unsigned long long hz); @@ -304,14 +302,7 @@ struct tracecmd_recorder *tracecmd_create_buffer_recorder_maxkb(const char *file int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep); void tracecmd_stop_recording(struct tracecmd_recorder *recorder); -void tracecmd_stat_cpu(struct trace_seq *s, int cpu); long tracecmd_flush_recording(struct tracecmd_recorder *recorder); -void tracecmd_filter_pid(int pid, int exclude); -int tracecmd_add_event(const char *event_str, int stack); -void tracecmd_enable_events(void); -void tracecmd_disable_all_tracing(int disable_tracer); -void tracecmd_disable_tracing(void); -void tracecmd_enable_tracing(void); enum tracecmd_msg_flags { TRACECMD_MSG_FL_USE_TCP = 1 << 0, diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h index e2d5506..05760d8 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -216,6 +216,17 @@ void show_instance_file(struct buffer_instance *instance, const char *name); int count_cpus(void); +/* moved from trace-cmd.h */ +void tracecmd_create_top_instance(char *name); +void tracecmd_remove_instances(void); +void tracecmd_filter_pid(int pid, int exclude); +int tracecmd_add_event(const char *event_str, int stack); +void tracecmd_enable_events(void); +void tracecmd_disable_all_tracing(int disable_tracer); +void tracecmd_disable_tracing(void); +void tracecmd_enable_tracing(void); +void tracecmd_stat_cpu(struct trace_seq *s, int cpu); + /* No longer in event-utils.h */ void __noreturn die(const char *fmt, ...); /* Can be overriden */ void *malloc_or_die(unsigned int size); /* Can be overridden */
These APIs depend on trace-cmd context and cannot be used standalone: tracecmd_create_top_instance() tracecmd_remove_instances() tracecmd_filter_pid() tracecmd_add_event() tracecmd_enable_events() tracecmd_disable_all_tracing() tracecmd_disable_tracing() tracecmd_enable_tracing() tracecmd_stat_cpu() They are implemented in trace-cmd application, but declared as APIs in trace-cmd.h. The declarations are moved from trace-cmd.h to trace-local.h, local header file visible only to trace-cmd application. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- include/trace-cmd/trace-cmd.h | 9 --------- tracecmd/include/trace-local.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-)