projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix endianness and major/minor output
[lttng-ust.git]
/
libust
/
ltt-events.c
diff --git
a/libust/ltt-events.c
b/libust/ltt-events.c
index 325fe1d06df8e54d537ba03468306dfe359fea17..c9a7773fa744959c0633750d56f7e06dbd5af5d3 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>
@@
-299,7
+300,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
+327,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;
@@
-549,7
+553,7
@@
int _ltt_field_statedump(struct ltt_session *session,
switch (field->type.atype) {
case atype_integer:
ret = lttng_metadata_printf(session,
switch (field->type.atype) {
case atype_integer:
ret = lttng_metadata_printf(session,
- " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s;\n",
+ " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s }
_
%s;\n",
field->type.u.basic.integer.size,
field->type.u.basic.integer.alignment,
field->type.u.basic.integer.signedness,
field->type.u.basic.integer.size,
field->type.u.basic.integer.alignment,
field->type.u.basic.integer.signedness,
@@
-559,7
+563,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
+572,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;" : "",
@@
-591,7
+595,7
@@
int _ltt_field_statedump(struct ltt_session *session,
elem_type = &field->type.u.array.elem_type;
ret = lttng_metadata_printf(session,
elem_type = &field->type.u.array.elem_type;
ret = lttng_metadata_printf(session,
- " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[%u];\n",
+ " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s }
_
%s[%u];\n",
elem_type->u.basic.integer.size,
elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
elem_type->u.basic.integer.size,
elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
@@
-601,7
+605,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
+631,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;" : "",
@@
-637,7
+641,7
@@
int _ltt_field_statedump(struct ltt_session *session,
return ret;
ret = lttng_metadata_printf(session,
return ret;
ret = lttng_metadata_printf(session,
- " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n",
+ " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s }
_
%s[ __%s_length ];\n",
elem_type->u.basic.integer.size,
(unsigned int) elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
elem_type->u.basic.integer.size,
(unsigned int) elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
@@
-647,7
+651,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;" : "",
@@
-660,7
+664,7
@@
int _ltt_field_statedump(struct ltt_session *session,
case atype_string:
/* Default encoding is UTF8 */
ret = lttng_metadata_printf(session,
case atype_string:
/* Default encoding is UTF8 */
ret = lttng_metadata_printf(session,
- " string%s %s;\n",
+ " string%s
_
%s;\n",
field->type.u.basic.string.encoding == lttng_encode_ASCII ?
" { encoding = ASCII; }" : "",
field->name);
field->type.u.basic.string.encoding == lttng_encode_ASCII ?
" { encoding = ASCII; }" : "",
field->name);
@@
-938,7
+942,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"
This page took
0.026149 seconds
and
4
git commands to generate.