projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add missing declaration for disable-lttng-ust
[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 f38cf3d8d0a6f96a48250cafd58b96a8f53feb36..6a17776aa4fc10a8337c1aa9ea3383515d9f480a 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-kernel.c
+++ b/
src/bin/lttng-sessiond/trace-kernel.c
@@
-35,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);
@@
-49,7
+47,6
@@
struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
}
}
}
}
-error:
return NULL;
}
return NULL;
}
@@
-61,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) {
@@
-74,7
+69,6
@@
struct ltt_kernel_event *trace_kernel_get_event_by_name(
}
}
}
}
-error:
return NULL;
}
return NULL;
}
@@
-115,7
+109,7
@@
struct ltt_kernel_session *trace_kernel_create_session(char *path)
*/
lks->tmp_consumer = NULL;
*/
lks->tmp_consumer = NULL;
- if (
path && strlen(path) > 0
) {
+ if (
*path != '\0'
) {
int ret;
/* Use the default consumer output which is the tracing session path. */
int ret;
/* Use the default consumer output which is the tracing session path. */
@@
-149,10
+143,12
@@
alloc_error:
* Return pointer to structure or NULL.
*/
struct ltt_kernel_channel *trace_kernel_create_channel(
* Return pointer to structure or NULL.
*/
struct ltt_kernel_channel *trace_kernel_create_channel(
- struct lttng_channel *chan
, char *path
)
+ struct lttng_channel *chan)
{
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");
@@
-162,6
+158,7
@@
struct ltt_kernel_channel *trace_kernel_create_channel(
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));
@@
-191,6
+188,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) {
@@
-274,8
+273,8
@@
struct ltt_kernel_metadata *trace_kernel_create_metadata(void)
chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
chan->attr.subbuf_size = default_get_metadata_subbuf_size();
chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
chan->attr.subbuf_size = default_get_metadata_subbuf_size();
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 */
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
/* Init metadata */
@@
-302,6
+301,8
@@
struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
int ret;
struct ltt_kernel_stream *lks;
int ret;
struct ltt_kernel_stream *lks;
+ assert(name);
+
lks = zmalloc(sizeof(struct ltt_kernel_stream));
if (lks == NULL) {
PERROR("kernel stream zmalloc");
lks = zmalloc(sizeof(struct ltt_kernel_stream));
if (lks == NULL) {
PERROR("kernel stream zmalloc");
@@
-319,6
+320,7
@@
struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
/* Init stream */
lks->fd = -1;
lks->state = 0;
/* Init stream */
lks->fd = -1;
lks->state = 0;
+ lks->cpu = count;
return lks;
return lks;
@@
-331,6
+333,8
@@
error:
*/
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
{
*/
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
{
+ 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) {
@@
-352,6
+356,8
@@
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)
{
+ assert(event);
+
if (event->fd >= 0) {
int ret;
if (event->fd >= 0) {
int ret;
@@
-381,6
+387,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) {
@@
-413,6
+421,8
@@
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)
{
+ 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) {
@@
-436,6
+446,8
@@
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
struct ltt_kernel_channel *channel, *ctmp;
int ret;
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) {
This page took
0.026417 seconds
and
4
git commands to generate.