projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.7.7
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index aac9c5899355df496ec5a31f9635b43918220726..992ba58f2a96200650924dd6d0856b513b6eb529 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-50,7
+50,10
@@
#include "lttng-events.h"
#include "lttng-tracer.h"
#include "lttng-abi-old.h"
#include "lttng-events.h"
#include "lttng-tracer.h"
#include "lttng-abi-old.h"
+#include "lttng-endian.h"
#include "wrapper/vzalloc.h"
#include "wrapper/vzalloc.h"
+#include "wrapper/ringbuffer/backend.h"
+#include "wrapper/ringbuffer/frontend.h"
#define METADATA_CACHE_DEFAULT_SIZE 4096
#define METADATA_CACHE_DEFAULT_SIZE 4096
@@
-236,6
+239,12
@@
int lttng_session_enable(struct lttng_session *session)
/* We need to sync enablers with session before activation. */
lttng_session_sync_enablers(session);
/* We need to sync enablers with session before activation. */
lttng_session_sync_enablers(session);
+ /* Clear each stream's quiescent state. */
+ list_for_each_entry(chan, &session->chan, list) {
+ if (chan->channel_type != METADATA_CHANNEL)
+ lib_ring_buffer_clear_quiescent_channel(chan->chan);
+ }
+
ACCESS_ONCE(session->active) = 1;
ACCESS_ONCE(session->been_active) = 1;
ret = _lttng_session_metadata_statedump(session);
ACCESS_ONCE(session->active) = 1;
ACCESS_ONCE(session->been_active) = 1;
ret = _lttng_session_metadata_statedump(session);
@@
-254,6
+263,7
@@
end:
int lttng_session_disable(struct lttng_session *session)
{
int ret = 0;
int lttng_session_disable(struct lttng_session *session)
{
int ret = 0;
+ struct lttng_channel *chan;
mutex_lock(&sessions_mutex);
if (!session->active) {
mutex_lock(&sessions_mutex);
if (!session->active) {
@@
-265,6
+275,12
@@
int lttng_session_disable(struct lttng_session *session)
/* Set transient enabler state to "disabled" */
session->tstate = 0;
lttng_session_sync_enablers(session);
/* Set transient enabler state to "disabled" */
session->tstate = 0;
lttng_session_sync_enablers(session);
+
+ /* Set each stream's quiescent state. */
+ list_for_each_entry(chan, &session->chan, list) {
+ if (chan->channel_type != METADATA_CHANNEL)
+ lib_ring_buffer_set_quiescent_channel(chan->chan);
+ }
end:
mutex_unlock(&sessions_mutex);
return ret;
end:
mutex_unlock(&sessions_mutex);
return ret;
@@
-1636,7
+1652,7
@@
int _lttng_field_statedump(struct lttng_session *session,
? "UTF8"
: "ASCII",
field->type.u.basic.integer.base,
? "UTF8"
: "ASCII",
field->type.u.basic.integer.base,
-#if
def
__BIG_ENDIAN
+#if
__BYTE_ORDER ==
__BIG_ENDIAN
field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@
-1665,7
+1681,7
@@
int _lttng_field_statedump(struct lttng_session *session,
? "UTF8"
: "ASCII",
elem_type->u.basic.integer.base,
? "UTF8"
: "ASCII",
elem_type->u.basic.integer.base,
-#if
def
__BIG_ENDIAN
+#if
__BYTE_ORDER ==
__BIG_ENDIAN
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@
-1691,7
+1707,7
@@
int _lttng_field_statedump(struct lttng_session *session,
? "UTF8"
: "ASCII"),
length_type->u.basic.integer.base,
? "UTF8"
: "ASCII"),
length_type->u.basic.integer.base,
-#if
def
__BIG_ENDIAN
+#if
__BYTE_ORDER ==
__BIG_ENDIAN
length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@
-1711,7
+1727,7
@@
int _lttng_field_statedump(struct lttng_session *session,
? "UTF8"
: "ASCII"),
elem_type->u.basic.integer.base,
? "UTF8"
: "ASCII"),
elem_type->u.basic.integer.base,
-#if
def
__BIG_ENDIAN
+#if
__BYTE_ORDER ==
__BIG_ENDIAN
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
#else
elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@
-2041,7
+2057,7
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
CTF_SPEC_MAJOR,
CTF_SPEC_MINOR,
uuid_s,
CTF_SPEC_MAJOR,
CTF_SPEC_MINOR,
uuid_s,
-#if
def
__BIG_ENDIAN
+#if
__BYTE_ORDER ==
__BIG_ENDIAN
"be"
#else
"le"
"be"
#else
"le"
@@
-2195,6
+2211,9
@@
static int __init lttng_events_init(void)
if (ret)
return ret;
ret = wrapper_get_pfnblock_flags_mask_init();
if (ret)
return ret;
ret = wrapper_get_pfnblock_flags_mask_init();
+ if (ret)
+ return ret;
+ ret = wrapper_get_pageblock_flags_mask_init();
if (ret)
return ret;
ret = lttng_context_init();
if (ret)
return ret;
ret = lttng_context_init();
This page took
0.02503 seconds
and
4
git commands to generate.