From 62499ad6813a67ea23ef39bcfbbf21c40136442a Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 26 Aug 2011 11:30:32 -0400 Subject: [PATCH] Rename trace.c/.h to trace-kernel Note that the file only contains evidently kernel data structures and functions signatures. Signed-off-by: David Goulet --- ltt-sessiond/Makefile.am | 13 +++++-- ltt-sessiond/context.c | 4 +- ltt-sessiond/context.h | 2 +- ltt-sessiond/kernel-ctl.c | 10 ++--- ltt-sessiond/kernel-ctl.h | 2 +- ltt-sessiond/main.c | 26 ++++++------- ltt-sessiond/{trace.c => trace-kernel.c} | 36 +++++++++--------- ltt-sessiond/{trace.h => trace-kernel.h} | 48 +++++++++--------------- ltt-sessiond/ust-ctl.h | 13 +------ 9 files changed, 68 insertions(+), 86 deletions(-) rename ltt-sessiond/{trace.c => trace-kernel.c} (89%) rename ltt-sessiond/{trace.h => trace-kernel.h} (70%) diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am index 2f65a2fb8..1603b29c6 100644 --- a/ltt-sessiond/Makefile.am +++ b/ltt-sessiond/Makefile.am @@ -5,11 +5,16 @@ AM_CFLAGS = -fno-strict-aliasing bin_PROGRAMS = ltt-sessiond -ltt_sessiond_SOURCES = utils.c trace.c session.c traceable-app.c ust-ctl.c \ - kernel-ctl.c context.c futex.c futex.h \ - utils.h trace.h session.h traceable-app.h ust-ctl.h \ +ltt_sessiond_SOURCES = utils.c utils.h \ + trace-kernel.c trace-kernel.h \ + session.c session.h \ + traceable-app.c traceable-app.h \ + ust-ctl.c ust-ctl.h \ + kernel-ctl.c kernel-ctl.h \ + context.c context.h \ + futex.c futex.h \ ust-comm.c ust-comm.h \ - context.h kernel-ctl.h ltt-sessiond.h main.c + ltt-sessiond.h main.c # link on liblttngctl for check if sessiond is already alive. ltt_sessiond_LDADD = \ diff --git a/ltt-sessiond/context.c b/ltt-sessiond/context.c index 7ec75ffaf..aebee0607 100644 --- a/ltt-sessiond/context.c +++ b/ltt-sessiond/context.c @@ -39,7 +39,7 @@ static int add_kctx_to_event(struct lttng_kernel_context *kctx, DBG("Add kernel context to event %s", event_name); - kevent = get_kernel_event_by_name(event_name, kchan); + kevent = trace_kernel_get_event_by_name(event_name, kchan); if (kevent != NULL) { ret = kernel_add_event_context(kevent, kctx); if (ret < 0) { @@ -165,7 +165,7 @@ int add_kernel_context(struct ltt_kernel_session *ksession, } } else { /* Get kernel channel */ - kchan = get_kernel_channel_by_name(channel_name, ksession); + kchan = trace_kernel_get_channel_by_name(channel_name, ksession); if (kchan == NULL) { ret = LTTCOMM_KERN_CHAN_NOT_FOUND; goto error; diff --git a/ltt-sessiond/context.h b/ltt-sessiond/context.h index c8cd62776..a3d82e0b7 100644 --- a/ltt-sessiond/context.h +++ b/ltt-sessiond/context.h @@ -20,7 +20,7 @@ #include -#include "trace.h" +#include "trace-kernel.h" int add_kernel_context(struct ltt_kernel_session *ksession, struct lttng_kernel_context *kctx, char *event_name, diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c index 6247ce6bd..d088115f7 100644 --- a/ltt-sessiond/kernel-ctl.c +++ b/ltt-sessiond/kernel-ctl.c @@ -102,7 +102,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd) struct ltt_kernel_session *lks; /* Allocate data structure */ - lks = trace_create_kernel_session(); + lks = trace_kernel_create_session(); if (lks == NULL) { ret = -1; goto error; @@ -144,7 +144,7 @@ int kernel_create_channel(struct ltt_kernel_session *session, struct ltt_kernel_channel *lkc; /* Allocate kernel channel */ - lkc = trace_create_kernel_channel(chan, path); + lkc = trace_kernel_create_channel(chan, path); if (lkc == NULL) { goto error; } @@ -187,7 +187,7 @@ int kernel_create_event(struct lttng_event *ev, int ret; struct ltt_kernel_event *event; - event = trace_create_kernel_event(ev); + event = trace_kernel_create_event(ev); if (event == NULL) { goto error; } @@ -322,7 +322,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session, char *path) struct ltt_kernel_metadata *lkm; /* Allocate kernel metadata */ - lkm = trace_create_kernel_metadata(path); + lkm = trace_kernel_create_metadata(path); if (lkm == NULL) { goto error; } @@ -474,7 +474,7 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel) struct ltt_kernel_stream *lks; while ((ret = kernctl_create_stream(channel->fd)) > 0) { - lks = trace_create_kernel_stream(); + lks = trace_kernel_create_stream(); if (lks == NULL) { close(ret); goto error; diff --git a/ltt-sessiond/kernel-ctl.h b/ltt-sessiond/kernel-ctl.h index a78173953..2fbaca91e 100644 --- a/ltt-sessiond/kernel-ctl.h +++ b/ltt-sessiond/kernel-ctl.h @@ -20,7 +20,7 @@ #define _LTT_KERNEL_CTL_H #include "session.h" -#include "trace.h" +#include "trace-kernel.h" /* * Default size for the event list when kernel_list_events is called. This size diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index b636986f8..29e05b9e9 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -182,7 +182,7 @@ static void teardown_kernel_session(struct ltt_session *session) lttcomm_close_unix_sock(session->kernel_session->consumer_fd); } - trace_destroy_kernel_session(session->kernel_session); + trace_kernel_destroy_session(session->kernel_session); /* Extra precaution */ session->kernel_session = NULL; } @@ -1807,7 +1807,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: - kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ret = LTTCOMM_KERN_CHAN_NOT_FOUND; @@ -1845,14 +1845,14 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: - kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ret = LTTCOMM_KERN_CHAN_NOT_FOUND; goto error; } - kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, kchan); + kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.disable.name, kchan); if (kevent != NULL) { DBG("Disabling kernel event %s for channel %s.", kevent->event->name, kchan->channel->name); @@ -1888,7 +1888,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: DBG("Disabling all enabled kernel events"); - kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ret = LTTCOMM_KERN_CHAN_NOT_FOUND; @@ -1929,7 +1929,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: - kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, + kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { /* Channel not found, creating it */ @@ -1987,7 +1987,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: - kchan = get_kernel_channel_by_name(channel_name, + kchan = trace_kernel_get_channel_by_name(channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { DBG("Channel not found. Creating channel %s", channel_name); @@ -2004,7 +2004,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_KERN_CHAN_FAIL; goto error; } - kchan = get_kernel_channel_by_name(channel_name, + kchan = trace_kernel_get_channel_by_name(channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ERR("Channel %s not found after creation. Internal error, giving up.", @@ -2014,7 +2014,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } } - kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); + kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); if (kevent == NULL) { DBG("Creating kernel event %s for channel %s.", cmd_ctx->lsm->u.enable.event.name, channel_name); @@ -2065,7 +2065,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->domain.type) { case LTTNG_DOMAIN_KERNEL: - kchan = get_kernel_channel_by_name(channel_name, + kchan = trace_kernel_get_channel_by_name(channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { DBG("Channel not found. Creating channel %s", channel_name); @@ -2082,7 +2082,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_KERN_CHAN_FAIL; goto error; } - kchan = get_kernel_channel_by_name(channel_name, + kchan = trace_kernel_get_channel_by_name(channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ERR("Channel %s not found after creation. Internal error, giving up.", @@ -2109,7 +2109,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } for (i = 0; i < size; i++) { - kevent = get_kernel_event_by_name(event_list[i].name, kchan); + kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan); if (kevent == NULL) { /* Default event type for enable all */ event_list[i].type = LTTNG_EVENT_TRACEPOINT; @@ -2393,7 +2393,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) struct ltt_kernel_channel *kchan = NULL; if (cmd_ctx->session->kernel_session != NULL) { - kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.list.channel_name, + kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.list.channel_name, cmd_ctx->session->kernel_session); if (kchan == NULL) { ret = LTTCOMM_KERN_CHAN_NOT_FOUND; diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace-kernel.c similarity index 89% rename from ltt-sessiond/trace.c rename to ltt-sessiond/trace-kernel.c index 8b123a79d..3b51e3175 100644 --- a/ltt-sessiond/trace.c +++ b/ltt-sessiond/trace-kernel.c @@ -24,12 +24,12 @@ #include -#include "trace.h" +#include "trace-kernel.h" /* * Find the channel name for the given kernel session. */ -struct ltt_kernel_channel *get_kernel_channel_by_name( +struct ltt_kernel_channel *trace_kernel_get_channel_by_name( char *name, struct ltt_kernel_session *session) { struct ltt_kernel_channel *chan; @@ -53,7 +53,7 @@ error: /* * Find the event name for the given channel. */ -struct ltt_kernel_event *get_kernel_event_by_name( +struct ltt_kernel_event *trace_kernel_get_event_by_name( char *name, struct ltt_kernel_channel *channel) { struct ltt_kernel_event *ev; @@ -80,7 +80,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_session *trace_create_kernel_session(void) +struct ltt_kernel_session *trace_kernel_create_session(void) { struct ltt_kernel_session *lks; @@ -111,7 +111,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path) +struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path) { int ret; struct ltt_kernel_channel *lkc; @@ -155,7 +155,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev) +struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev) { struct ltt_kernel_event *lke; struct lttng_kernel_event *attr; @@ -220,7 +220,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path) +struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path) { int ret; struct ltt_kernel_metadata *lkm; @@ -263,7 +263,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_stream *trace_create_kernel_stream(void) +struct ltt_kernel_stream *trace_kernel_create_stream(void) { struct ltt_kernel_stream *lks; @@ -287,7 +287,7 @@ error: /* * Cleanup kernel stream structure. */ -void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream) +void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream) { DBG("[trace] Closing stream fd %d", stream->fd); /* Close kernel fd */ @@ -302,7 +302,7 @@ void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream) /* * Cleanup kernel event structure. */ -void trace_destroy_kernel_event(struct ltt_kernel_event *event) +void trace_kernel_destroy_event(struct ltt_kernel_event *event) { DBG("[trace] Closing event fd %d", event->fd); /* Close kernel fd */ @@ -318,7 +318,7 @@ void trace_destroy_kernel_event(struct ltt_kernel_event *event) /* * Cleanup kernel channel structure. */ -void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel) +void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel) { struct ltt_kernel_stream *stream, *stmp; struct ltt_kernel_event *event, *etmp; @@ -332,12 +332,12 @@ void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel) /* For each stream in the channel list */ cds_list_for_each_entry_safe(stream, stmp, &channel->stream_list.head, list) { - trace_destroy_kernel_stream(stream); + trace_kernel_destroy_stream(stream); } /* For each event in the channel list */ cds_list_for_each_entry_safe(event, etmp, &channel->events_list.head, list) { - trace_destroy_kernel_event(event); + trace_kernel_destroy_event(event); } /* Remove from channel list */ @@ -348,7 +348,7 @@ void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel) /* * Cleanup kernel metadata structure. */ -void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata) +void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata) { DBG("[trace] Closing metadata fd %d", metadata->fd); /* Close kernel fd */ @@ -360,9 +360,9 @@ void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata) } /* - * Cleanup kernel session structure + * Cleanup kernel session structure */ -void trace_destroy_kernel_session(struct ltt_kernel_session *session) +void trace_kernel_destroy_session(struct ltt_kernel_session *session) { struct ltt_kernel_channel *channel, *ctmp; @@ -375,11 +375,11 @@ void trace_destroy_kernel_session(struct ltt_kernel_session *session) } if (session->metadata != NULL) { - trace_destroy_kernel_metadata(session->metadata); + trace_kernel_destroy_metadata(session->metadata); } cds_list_for_each_entry_safe(channel, ctmp, &session->channel_list.head, list) { - trace_destroy_kernel_channel(channel); + trace_kernel_destroy_channel(channel); } free(session); diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace-kernel.h similarity index 70% rename from ltt-sessiond/trace.h rename to ltt-sessiond/trace-kernel.h index 6fd36d61c..aaadbb28e 100644 --- a/ltt-sessiond/trace.h +++ b/ltt-sessiond/trace-kernel.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LTT_TRACE_H -#define _LTT_TRACE_H +#ifndef _LTT_TRACE_KERNEL_H +#define _LTT_TRACE_KERNEL_H #include #include @@ -91,43 +91,31 @@ struct ltt_kernel_session { struct ltt_kernel_channel_list channel_list; }; -/* UST trace representation */ -struct ltt_ust_trace { - struct cds_list_head list; - char name[NAME_MAX]; - int shmid; - pid_t pid; - struct cds_list_head markers; -}; - -struct ltt_ust_marker { - struct cds_list_head list; - char *name; - char *channel; -}; - -struct ltt_kernel_event *get_kernel_event_by_name( +/* + * Lookup functions. NULL is returned if not found. + */ +struct ltt_kernel_event *trace_kernel_get_event_by_name( char *name, struct ltt_kernel_channel *channel); -struct ltt_kernel_channel *get_kernel_channel_by_name( +struct ltt_kernel_channel *trace_kernel_get_channel_by_name( char *name, struct ltt_kernel_session *session); /* * Create functions malloc() the data structure. */ -struct ltt_kernel_session *trace_create_kernel_session(void); -struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path); -struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev); -struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path); -struct ltt_kernel_stream *trace_create_kernel_stream(void); +struct ltt_kernel_session *trace_kernel_create_session(void); +struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path); +struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev); +struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path); +struct ltt_kernel_stream *trace_kernel_create_stream(void); /* * Destroy functions free() the data structure and remove from linked list if * it's applies. */ -void trace_destroy_kernel_session(struct ltt_kernel_session *session); -void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata); -void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel); -void trace_destroy_kernel_event(struct ltt_kernel_event *event); -void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream); +void trace_kernel_destroy_session(struct ltt_kernel_session *session); +void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata); +void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel); +void trace_kernel_destroy_event(struct ltt_kernel_event *event); +void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream); -#endif /* _LTT_TRACE_H */ +#endif /* _LTT_TRACE_KERNEL_H */ diff --git a/ltt-sessiond/ust-ctl.h b/ltt-sessiond/ust-ctl.h index b864c0802..6ec5fbdc4 100644 --- a/ltt-sessiond/ust-ctl.h +++ b/ltt-sessiond/ust-ctl.h @@ -19,15 +19,4 @@ #ifndef _LTT_UST_CTL_H #define _LTT_UST_CTL_H -#include "session.h" -#include "trace.h" - -/* -int get_trace_count_per_session(struct ltt_session *session); -void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces); -int ust_create_trace(struct command_ctx *cmd_ctx); -int ust_start_trace(struct command_ctx *cmd_ctx); -int ust_stop_trace(struct command_ctx *cmd_ctx); -*/ - -#endif /* _LTT_TRACE_H */ +#endif /* _LTT_UST_CTL_H */ -- 2.34.1