projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ltt_events_exit to lttng_ust_events_exit
[lttng-ust.git]
/
libust
/
ltt-events.c
diff --git
a/libust/ltt-events.c
b/libust/ltt-events.c
index 8f21d458080b150f13c998fb3dd546a2cb1b963b..f48d72b6abf95575cbb888e40716b98883e3eb54 100644
(file)
--- a/
libust/ltt-events.c
+++ b/
libust/ltt-events.c
@@
-10,6
+10,7
@@
#define _GNU_SOURCE
#include <stdio.h>
#define _GNU_SOURCE
#include <stdio.h>
+#include <endian.h>
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
@@
-145,6
+146,9
@@
int pending_probe_fix_events(const struct lttng_event_desc *desc)
ret |= __tracepoint_probe_register(name,
event->desc->probe_callback,
event);
ret |= __tracepoint_probe_register(name,
event->desc->probe_callback,
event);
+ if (ret)
+ continue;
+ event->id = chan->free_event_id++;
ret |= _ltt_event_metadata_statedump(chan->session, chan,
event);
}
ret |= _ltt_event_metadata_statedump(chan->session, chan,
event);
}
@@
-299,7
+303,9
@@
struct ltt_channel *ltt_channel_create(struct ltt_session *session,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
- unsigned int read_timer_interval)
+ unsigned int read_timer_interval,
+ int *shm_fd, int *wait_fd,
+ uint64_t *memory_map_size)
{
struct ltt_channel *chan;
struct ltt_transport *transport;
{
struct ltt_channel *chan;
struct ltt_transport *transport;
@@
-324,7
+330,8
@@
struct ltt_channel *ltt_channel_create(struct ltt_session *session,
*/
transport->ops.channel_create("[lttng]", chan, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
*/
transport->ops.channel_create("[lttng]", chan, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
- read_timer_interval);
+ read_timer_interval, shm_fd, wait_fd,
+ memory_map_size);
if (!chan->chan)
goto create_error;
chan->enabled = 1;
if (!chan->chan)
goto create_error;
chan->enabled = 1;
@@
-488,7
+495,7
@@
void _ltt_event_destroy(struct ltt_event *event)
int lttng_metadata_printf(struct ltt_session *session,
const char *fmt, ...)
{
int lttng_metadata_printf(struct ltt_session *session,
const char *fmt, ...)
{
- struct lib_ring_buffer_ctx ctx;
+ struct l
ttng_ust_l
ib_ring_buffer_ctx ctx;
struct ltt_channel *chan = session->metadata;
char *str = NULL;
int ret = 0, waitret;
struct ltt_channel *chan = session->metadata;
char *str = NULL;
int ret = 0, waitret;
@@
-559,7
+566,7
@@
int _ltt_field_statedump(struct ltt_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;" : "",
@@
-568,11
+575,11
@@
int _ltt_field_statedump(struct ltt_session *session,
break;
case atype_float:
ret = lttng_metadata_printf(session,
break;
case atype_float:
ret = lttng_metadata_printf(session,
- " floating_point { exp_dig = %u; mant_dig = %u; align = %u; } _%s;\n",
+ " floating_point { exp_dig = %u; mant_dig = %u; align = %u;
%s
} _%s;\n",
field->type.u.basic._float.exp_dig,
field->type.u.basic._float.mant_dig,
field->type.u.basic._float.alignment,
field->type.u.basic._float.exp_dig,
field->type.u.basic._float.mant_dig,
field->type.u.basic._float.alignment,
-#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;" : "",
@@
-601,7
+608,7
@@
int _ltt_field_statedump(struct ltt_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;" : "",
@@
-627,7
+634,7
@@
int _ltt_field_statedump(struct ltt_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;" : "",
@@
-647,7
+654,7
@@
int _ltt_field_statedump(struct ltt_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;" : "",
@@
-938,7
+945,7
@@
int _ltt_session_metadata_statedump(struct ltt_session *session)
CTF_VERSION_MAJOR,
CTF_VERSION_MINOR,
uuid_s,
CTF_VERSION_MAJOR,
CTF_VERSION_MINOR,
uuid_s,
-#if
def __BIG_ENDIAN
+#if
(BYTE_ORDER == BIG_ENDIAN)
"be"
#else
"le"
"be"
#else
"le"
@@
-994,7
+1001,7
@@
void ltt_transport_unregister(struct ltt_transport *transport)
cds_list_del(&transport->node);
}
cds_list_del(&transport->node);
}
-void ltt_events_exit(void)
+void ltt
ng_ust
_events_exit(void)
{
struct ltt_session *session, *tmpsession;
{
struct ltt_session *session, *tmpsession;
This page took
0.024959 seconds
and
4
git commands to generate.