projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version to 2.0-pre5
[lttng-tools.git]
/
ltt-sessiond
/
trace.c
diff --git
a/ltt-sessiond/trace.c
b/ltt-sessiond/trace.c
index db829ce726ab4f0cb25cae05f4a47e3f1ed14336..41c4355e939fa67e4c8a7f8b2c4d660e4fc0e6ff 100644
(file)
--- a/
ltt-sessiond/trace.c
+++ b/
ltt-sessiond/trace.c
@@
-3,8
+3,8
@@
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation;
either
version 2
- * of the License
, or (at your option) any later version
.
+ * as published by the Free Software Foundation;
only
version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-138,7
+138,9
@@
struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *cha
lkc->fd = 0;
lkc->stream_count = 0;
lkc->fd = 0;
lkc->stream_count = 0;
+ lkc->event_count = 0;
lkc->enabled = 1;
lkc->enabled = 1;
+ lkc->ctx = NULL;
/* 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);
@@
-202,6
+204,7
@@
struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
lke->fd = 0;
lke->event = attr;
lke->enabled = 1;
lke->fd = 0;
lke->event = attr;
lke->enabled = 1;
+ lke->ctx = NULL;
return lke;
return lke;
@@
-309,8
+312,8
@@
void trace_destroy_kernel_event(struct ltt_kernel_event *event)
void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
{
void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
{
- struct ltt_kernel_stream *stream;
- struct ltt_kernel_event *event;
+ struct ltt_kernel_stream *stream
, *stmp
;
+ struct ltt_kernel_event *event
, *etmp
;
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
@@
-320,12
+323,12
@@
void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
free(channel->channel);
/* For each stream in the channel list */
free(channel->channel);
/* For each stream in the channel list */
- cds_list_for_each_entry
(stream
, &channel->stream_list.head, list) {
+ cds_list_for_each_entry
_safe(stream, stmp
, &channel->stream_list.head, list) {
trace_destroy_kernel_stream(stream);
}
/* For each event in the channel list */
trace_destroy_kernel_stream(stream);
}
/* For each event in the channel list */
- cds_list_for_each_entry
(event
, &channel->events_list.head, list) {
+ cds_list_for_each_entry
_safe(event, etmp
, &channel->events_list.head, list) {
trace_destroy_kernel_event(event);
}
trace_destroy_kernel_event(event);
}
@@
-347,7
+350,7
@@
void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata)
void trace_destroy_kernel_session(struct ltt_kernel_session *session)
{
void trace_destroy_kernel_session(struct ltt_kernel_session *session)
{
- struct ltt_kernel_channel *channel;
+ struct ltt_kernel_channel *channel
, *ctmp
;
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
@@
-361,7
+364,7
@@
void trace_destroy_kernel_session(struct ltt_kernel_session *session)
trace_destroy_kernel_metadata(session->metadata);
}
trace_destroy_kernel_metadata(session->metadata);
}
- cds_list_for_each_entry
(channel
, &session->channel_list.head, list) {
+ cds_list_for_each_entry
_safe(channel, ctmp
, &session->channel_list.head, list) {
trace_destroy_kernel_channel(channel);
}
trace_destroy_kernel_channel(channel);
}
This page took
0.025458 seconds
and
4
git commands to generate.