projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove #define _LGPL_SOURCE from public headers
[lttng-ust.git]
/
libust
/
serialize.c
diff --git
a/libust/serialize.c
b/libust/serialize.c
index bd947ab1f90d9cd1358bae1538d0f80de2429e62..c3b7fc3d1d918e534251ee3c7f13d39175d2221c 100644
(file)
--- a/
libust/serialize.c
+++ b/
libust/serialize.c
@@
-25,6
+25,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <unistd.h>
#include <sys/syscall.h>
#include <stdarg.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <stdarg.h>
@@
-32,7
+33,6
@@
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
-#define _LGPL_SOURCE
#include <urcu-bp.h>
#include <urcu/rculist.h>
#include <urcu-bp.h>
#include <urcu/rculist.h>
@@
-40,7
+40,7
@@
#include <ust/clock.h>
#include "buffers.h"
#include "tracer.h"
#include <ust/clock.h>
#include "buffers.h"
#include "tracer.h"
-#include "usterr.h"
+#include "usterr
_signal_safe
.h"
#include "ust_snprintf.h"
/*
#include "ust_snprintf.h"
/*
@@
-429,7
+429,7
@@
static inline size_t serialize_trace_data(struct ust_buffer *buf,
*/
tracer_stack_pos++;
assert(tracer_stack_pos <= TRACER_STACK_LEN);
*/
tracer_stack_pos++;
assert(tracer_stack_pos <= TRACER_STACK_LEN);
- barrier();
+
cmm_
barrier();
tracer_stack[*stack_pos_ctx] =
strlen(tmp.v_string.s) + 1;
}
tracer_stack[*stack_pos_ctx] =
strlen(tmp.v_string.s) + 1;
}
@@
-624,12
+624,12
@@
void ltt_write_event_data(struct ust_buffer *buf, size_t buf_offset,
}
}
-notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
+notrace void ltt_vtrace(const struct
ust_
marker *mdata, void *probe_data,
struct registers *regs, void *call_data,
const char *fmt, va_list *args)
{
int largest_align, ret;
struct registers *regs, void *call_data,
const char *fmt, va_list *args)
{
int largest_align, ret;
- struct ltt_active_marker *pdata;
+ struct ltt_active_
ust_
marker *pdata;
uint16_t eID;
size_t data_size, slot_size;
unsigned int chan_index;
uint16_t eID;
size_t data_size, slot_size;
unsigned int chan_index;
@@
-657,11
+657,11
@@
notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
cpu = ust_get_cpu();
/* Force volatile access. */
cpu = ust_get_cpu();
/* Force volatile access. */
-
STORE_SHARED(ltt_nesting,
LOAD_SHARED(ltt_nesting) + 1);
+
CMM_STORE_SHARED(ltt_nesting, CMM_
LOAD_SHARED(ltt_nesting) + 1);
stack_pos_ctx = tracer_stack_pos;
stack_pos_ctx = tracer_stack_pos;
- barrier();
+
cmm_
barrier();
- pdata = (struct ltt_active_marker *)probe_data;
+ pdata = (struct ltt_active_
ust_
marker *)probe_data;
eID = mdata->event_id;
chan_index = mdata->channel_id;
closure.callbacks = pdata->probe->callbacks;
eID = mdata->event_id;
chan_index = mdata->channel_id;
closure.callbacks = pdata->probe->callbacks;
@@
-685,7
+685,7
@@
notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
va_end(args_copy);
/* Iterate on each trace */
va_end(args_copy);
/* Iterate on each trace */
- list_for_each_entry_rcu(trace, <t_traces.head, list) {
+
cds_
list_for_each_entry_rcu(trace, <t_traces.head, list) {
/*
* Expect the filter to filter out events. If we get here,
* we went through tracepoint activation as a first step.
/*
* Expect the filter to filter out events. If we get here,
* we went through tracepoint activation as a first step.
@@
-745,14
+745,14
@@
notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
DBG("just commited event (%s/%s) at offset %ld and size %zd", mdata->channel, mdata->name, buf_offset, slot_size);
}
DBG("just commited event (%s/%s) at offset %ld and size %zd", mdata->channel, mdata->name, buf_offset, slot_size);
}
- barrier();
+
cmm_
barrier();
tracer_stack_pos = stack_pos_ctx;
tracer_stack_pos = stack_pos_ctx;
-
STORE_SHARED(ltt_nesting,
LOAD_SHARED(ltt_nesting) - 1);
+
CMM_STORE_SHARED(ltt_nesting, CMM_
LOAD_SHARED(ltt_nesting) - 1);
rcu_read_unlock(); //ust// rcu_read_unlock_sched_notrace();
}
rcu_read_unlock(); //ust// rcu_read_unlock_sched_notrace();
}
-notrace void ltt_trace(const struct marker *mdata, void *probe_data,
+notrace void ltt_trace(const struct
ust_
marker *mdata, void *probe_data,
struct registers *regs, void *call_data,
const char *fmt, ...)
{
struct registers *regs, void *call_data,
const char *fmt, ...)
{
This page took
0.025579 seconds
and
4
git commands to generate.