projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement health check for app registration dispatch
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-kernel.c
diff --git
a/src/bin/lttng-sessiond/trace-kernel.c
b/src/bin/lttng-sessiond/trace-kernel.c
index 48f6eea7d60e6db4b2e79766c11ac1b6f3a1f12a..d889b6ab6582570587c9c4a66cdcf51fad30943a 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-kernel.c
+++ b/
src/bin/lttng-sessiond/trace-kernel.c
@@
-24,6
+24,7
@@
#include <common/common.h>
#include <common/defaults.h>
#include <common/common.h>
#include <common/defaults.h>
+#include "consumer.h"
#include "trace-kernel.h"
/*
#include "trace-kernel.h"
/*
@@
-34,10
+35,8
@@
struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
{
struct ltt_kernel_channel *chan;
{
struct ltt_kernel_channel *chan;
- if (session == NULL) {
- ERR("Undefine session");
- goto error;
- }
+ assert(session);
+ assert(name);
DBG("Trying to find channel %s", name);
DBG("Trying to find channel %s", name);
@@
-48,7
+47,6
@@
struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
}
}
}
}
-error:
return NULL;
}
return NULL;
}
@@
-60,10
+58,8
@@
struct ltt_kernel_event *trace_kernel_get_event_by_name(
{
struct ltt_kernel_event *ev;
{
struct ltt_kernel_event *ev;
- if (channel == NULL) {
- ERR("Undefine channel");
- goto error;
- }
+ assert(name);
+ assert(channel);
cds_list_for_each_entry(ev, &channel->events_list.head, list) {
if (strcmp(name, ev->event->name) == 0) {
cds_list_for_each_entry(ev, &channel->events_list.head, list) {
if (strcmp(name, ev->event->name) == 0) {
@@
-73,7
+69,6
@@
struct ltt_kernel_event *trace_kernel_get_event_by_name(
}
}
}
}
-error:
return NULL;
}
return NULL;
}
@@
-82,16
+77,15
@@
error:
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_session *trace_kernel_create_session(
char *path
)
+struct ltt_kernel_session *trace_kernel_create_session(
void
)
{
{
- int ret;
- struct ltt_kernel_session *lks;
+ struct ltt_kernel_session *lks = NULL;
/* Allocate a new ltt kernel session */
lks = zmalloc(sizeof(struct ltt_kernel_session));
if (lks == NULL) {
PERROR("create kernel session zmalloc");
/* Allocate a new ltt kernel session */
lks = zmalloc(sizeof(struct ltt_kernel_session));
if (lks == NULL) {
PERROR("create kernel session zmalloc");
- goto error;
+ goto
alloc_
error;
}
/* Init data structure */
}
/* Init data structure */
@@
-100,19
+94,27
@@
struct ltt_kernel_session *trace_kernel_create_session(char *path)
lks->channel_count = 0;
lks->stream_count_global = 0;
lks->metadata = NULL;
lks->channel_count = 0;
lks->stream_count_global = 0;
lks->metadata = NULL;
- lks->consumer_fd = -1;
CDS_INIT_LIST_HEAD(&lks->channel_list.head);
CDS_INIT_LIST_HEAD(&lks->channel_list.head);
- /* Set session path */
- ret = asprintf(&lks->trace_path, "%s/kernel", path);
- if (ret < 0) {
- PERROR("asprintf kernel traces path");
+ lks->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+ if (lks->consumer == NULL) {
goto error;
}
goto error;
}
+ /*
+ * The tmp_consumer stays NULL until a set_consumer_uri command is
+ * executed. At this point, the consumer should be nullify until an
+ * enable_consumer command. This assignment is symbolic since we've zmalloc
+ * the struct.
+ */
+ lks->tmp_consumer = NULL;
+
return lks;
error:
return lks;
error:
+ free(lks);
+
+alloc_error:
return NULL;
}
return NULL;
}
@@
-121,11
+123,13
@@
error:
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path)
+struct ltt_kernel_channel *trace_kernel_create_channel(
+ struct lttng_channel *chan)
{
{
- int ret;
struct ltt_kernel_channel *lkc;
struct ltt_kernel_channel *lkc;
+ assert(chan);
+
lkc = zmalloc(sizeof(struct ltt_kernel_channel));
if (lkc == NULL) {
PERROR("ltt_kernel_channel zmalloc");
lkc = zmalloc(sizeof(struct ltt_kernel_channel));
if (lkc == NULL) {
PERROR("ltt_kernel_channel zmalloc");
@@
-135,6
+139,7
@@
struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *cha
lkc->channel = zmalloc(sizeof(struct lttng_channel));
if (lkc->channel == NULL) {
PERROR("lttng_channel zmalloc");
lkc->channel = zmalloc(sizeof(struct lttng_channel));
if (lkc->channel == NULL) {
PERROR("lttng_channel zmalloc");
+ free(lkc);
goto error;
}
memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
goto error;
}
memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
@@
-147,12
+152,6
@@
struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *cha
/* Init linked list */
CDS_INIT_LIST_HEAD(&lkc->events_list.head);
CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
/* Init linked list */
CDS_INIT_LIST_HEAD(&lkc->events_list.head);
CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
- /* Set default trace output path */
- ret = asprintf(&lkc->pathname, "%s", path);
- if (ret < 0) {
- PERROR("asprintf kernel create channel");
- goto error;
- }
return lkc;
return lkc;
@@
-170,6
+169,8
@@
struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
struct ltt_kernel_event *lke;
struct lttng_kernel_event *attr;
struct ltt_kernel_event *lke;
struct lttng_kernel_event *attr;
+ assert(ev);
+
lke = zmalloc(sizeof(struct ltt_kernel_event));
attr = zmalloc(sizeof(struct lttng_kernel_event));
if (lke == NULL || attr == NULL) {
lke = zmalloc(sizeof(struct ltt_kernel_event));
attr = zmalloc(sizeof(struct lttng_kernel_event));
if (lke == NULL || attr == NULL) {
@@
-223,11
+224,12
@@
struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
lke->fd = -1;
lke->event = attr;
lke->enabled = 1;
lke->fd = -1;
lke->event = attr;
lke->enabled = 1;
- lke->ctx = NULL;
return lke;
error:
return lke;
error:
+ free(lke);
+ free(attr);
return NULL;
}
return NULL;
}
@@
-236,9
+238,8
@@
error:
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_metadata *trace_kernel_create_metadata(
char *path
)
+struct ltt_kernel_metadata *trace_kernel_create_metadata(
void
)
{
{
- int ret;
struct ltt_kernel_metadata *lkm;
struct lttng_channel *chan;
struct ltt_kernel_metadata *lkm;
struct lttng_channel *chan;
@@
-251,25
+252,21
@@
struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path)
/* Set default attributes */
chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
/* Set default attributes */
chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
- chan->attr.subbuf_size =
DEFAULT_METADATA_SUBBUF_SIZE
;
+ chan->attr.subbuf_size =
default_get_metadata_subbuf_size()
;
chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
- chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
- chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+ chan->attr.switch_timer_interval = DEFAULT_
KERNEL_
CHANNEL_SWITCH_TIMER;
+ chan->attr.read_timer_interval = DEFAULT_
KERNEL_
CHANNEL_READ_TIMER;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
/* Init metadata */
lkm->fd = -1;
lkm->conf = chan;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
/* Init metadata */
lkm->fd = -1;
lkm->conf = chan;
- /* Set default metadata path */
- ret = asprintf(&lkm->pathname, "%s/metadata", path);
- if (ret < 0) {
- PERROR("asprintf kernel metadata");
- goto error;
- }
return lkm;
error:
return lkm;
error:
+ free(lkm);
+ free(chan);
return NULL;
}
return NULL;
}
@@
-279,20
+276,32
@@
error:
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_stream *trace_kernel_create_stream(void)
+struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
+ unsigned int count)
{
{
+ int ret;
struct ltt_kernel_stream *lks;
struct ltt_kernel_stream *lks;
+ assert(name);
+
lks = zmalloc(sizeof(struct ltt_kernel_stream));
if (lks == NULL) {
PERROR("kernel stream zmalloc");
goto error;
}
lks = zmalloc(sizeof(struct ltt_kernel_stream));
if (lks == NULL) {
PERROR("kernel stream zmalloc");
goto error;
}
+ /* Set name */
+ ret = snprintf(lks->name, sizeof(lks->name), "%s_%d", name, count);
+ if (ret < 0) {
+ PERROR("snprintf stream name");
+ goto error;
+ }
+ lks->name[sizeof(lks->name) - 1] = '\0';
+
/* Init stream */
lks->fd = -1;
/* Init stream */
lks->fd = -1;
- lks->pathname = NULL;
lks->state = 0;
lks->state = 0;
+ lks->cpu = count;
return lks;
return lks;
@@
-305,11
+314,13
@@
error:
*/
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
{
*/
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
{
-
int ret
;
+
assert(stream)
;
DBG("[trace] Closing stream fd %d", stream->fd);
/* Close kernel fd */
if (stream->fd >= 0) {
DBG("[trace] Closing stream fd %d", stream->fd);
/* Close kernel fd */
if (stream->fd >= 0) {
+ int ret;
+
ret = close(stream->fd);
if (ret) {
PERROR("close");
ret = close(stream->fd);
if (ret) {
PERROR("close");
@@
-318,7
+329,6
@@
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
/* Remove from stream list */
cds_list_del(&stream->list);
/* Remove from stream list */
cds_list_del(&stream->list);
- free(stream->pathname);
free(stream);
}
free(stream);
}
@@
-327,9
+337,11
@@
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
*/
void trace_kernel_destroy_event(struct ltt_kernel_event *event)
{
*/
void trace_kernel_destroy_event(struct ltt_kernel_event *event)
{
-
int ret
;
+
assert(event)
;
if (event->fd >= 0) {
if (event->fd >= 0) {
+ int ret;
+
DBG("[trace] Closing event fd %d", event->fd);
/* Close kernel fd */
ret = close(event->fd);
DBG("[trace] Closing event fd %d", event->fd);
/* Close kernel fd */
ret = close(event->fd);
@@
-344,7
+356,6
@@
void trace_kernel_destroy_event(struct ltt_kernel_event *event)
cds_list_del(&event->list);
free(event->event);
cds_list_del(&event->list);
free(event->event);
- free(event->ctx);
free(event);
}
free(event);
}
@@
-357,6
+368,8
@@
void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
struct ltt_kernel_event *event, *etmp;
int ret;
struct ltt_kernel_event *event, *etmp;
int ret;
+ assert(channel);
+
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
if (channel->fd >= 0) {
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
if (channel->fd >= 0) {
@@
-379,7
+392,6
@@
void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
/* Remove from channel list */
cds_list_del(&channel->list);
/* Remove from channel list */
cds_list_del(&channel->list);
- free(channel->pathname);
free(channel->channel);
free(channel->ctx);
free(channel);
free(channel->channel);
free(channel->ctx);
free(channel);
@@
-390,11
+402,13
@@
void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
*/
void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
{
*/
void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
{
-
int ret
;
+
assert(metadata)
;
DBG("[trace] Closing metadata fd %d", metadata->fd);
/* Close kernel fd */
if (metadata->fd >= 0) {
DBG("[trace] Closing metadata fd %d", metadata->fd);
/* Close kernel fd */
if (metadata->fd >= 0) {
+ int ret;
+
ret = close(metadata->fd);
if (ret) {
PERROR("close");
ret = close(metadata->fd);
if (ret) {
PERROR("close");
@@
-402,18
+416,21
@@
void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
}
free(metadata->conf);
}
free(metadata->conf);
- free(metadata->pathname);
free(metadata);
}
/*
* Cleanup kernel session structure
free(metadata);
}
/*
* Cleanup kernel session structure
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
{
struct ltt_kernel_channel *channel, *ctmp;
int ret;
*/
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
{
struct ltt_kernel_channel *channel, *ctmp;
int ret;
+ assert(session);
+
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
if (session->fd >= 0) {
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
if (session->fd >= 0) {
@@
-439,6
+456,9
@@
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
trace_kernel_destroy_channel(channel);
}
trace_kernel_destroy_channel(channel);
}
- free(session->trace_path);
+ /* Wipe consumer output object */
+ consumer_destroy_output(session->consumer);
+ consumer_destroy_output(session->tmp_consumer);
+
free(session);
}
free(session);
}
This page took
0.028927 seconds
and
5
git commands to generate.