projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ust-elf.h should be private, with public symbols
[lttng-ust.git]
/
liblttng-ust-ctl
/
ustctl.c
diff --git
a/liblttng-ust-ctl/ustctl.c
b/liblttng-ust-ctl/ustctl.c
index 0d2d1176d9c3ea8b722f2320d9ab571b4fe00f64..adf23af64a952cc9444776541c4ea07bfba5a900 100644
(file)
--- a/
liblttng-ust-ctl/ustctl.c
+++ b/
liblttng-ust-ctl/ustctl.c
@@
-94,13
+94,17
@@
extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
extern void lttng_ring_buffer_client_discard_exit(void);
extern void lttng_ring_buffer_client_discard_rt_exit(void);
extern void lttng_ring_buffer_metadata_client_exit(void);
extern void lttng_ring_buffer_client_discard_exit(void);
extern void lttng_ring_buffer_client_discard_rt_exit(void);
extern void lttng_ring_buffer_metadata_client_exit(void);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
extern void lttng_counter_client_percpu_32_modular_init(void);
extern void lttng_counter_client_percpu_32_modular_init(void);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
extern void lttng_counter_client_percpu_32_modular_exit(void);
extern void lttng_counter_client_percpu_32_modular_exit(void);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
extern void lttng_counter_client_percpu_64_modular_init(void);
extern void lttng_counter_client_percpu_64_modular_init(void);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
extern void lttng_counter_client_percpu_64_modular_exit(void);
int ustctl_release_handle(int sock, int handle)
extern void lttng_counter_client_percpu_64_modular_exit(void);
int ustctl_release_handle(int sock, int handle)
@@
-583,9
+587,10
@@
int ustctl_create_event_notifier(int sock, struct lttng_ust_abi_event_notifier *
free(event_notifier_data);
return ret;
}
free(event_notifier_data);
return ret;
}
- /* Send struct lttng_ust_event_notifier */
+ /* Send struct lttng_ust_
abi_
event_notifier */
len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
if (len != sizeof(*event_notifier)) {
len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
if (len != sizeof(*event_notifier)) {
+ free(event_notifier_data);
if (len < 0)
return len;
else
if (len < 0)
return len;
else
@@
-1264,7
+1269,7
@@
struct ustctl_consumer_channel *
return NULL;
}
return NULL;
}
- transport = lttng_transport_find(transport_name);
+ transport = lttng_
ust_
transport_find(transport_name);
if (!transport) {
DBG("LTTng transport %s not found\n",
transport_name);
if (!transport) {
DBG("LTTng transport %s not found\n",
transport_name);
@@
-1275,7
+1280,7
@@
struct ustctl_consumer_channel *
if (!chan)
return NULL;
if (!chan)
return NULL;
- chan->chan = transport->ops.channel_create(transport_name, NULL,
+ chan->chan = transport->ops.
priv->
channel_create(transport_name, NULL,
attr->subbuf_size, attr->num_subbuf,
attr->switch_timer_interval,
attr->read_timer_interval,
attr->subbuf_size, attr->num_subbuf,
attr->switch_timer_interval,
attr->read_timer_interval,
@@
-1300,7
+1305,7
@@
void ustctl_destroy_channel(struct ustctl_consumer_channel *chan)
{
(void) ustctl_channel_close_wait_fd(chan);
(void) ustctl_channel_close_wakeup_fd(chan);
{
(void) ustctl_channel_close_wait_fd(chan);
(void) ustctl_channel_close_wakeup_fd(chan);
- chan->chan->ops->channel_destroy(chan->chan);
+ chan->chan->ops->
priv->
channel_destroy(chan->chan);
free(chan);
}
free(chan);
}
@@
-1346,7
+1351,7
@@
int ustctl_write_metadata_to_channel(
for (pos = 0; pos < len; pos += reserve_len) {
reserve_len = min_t(size_t,
for (pos = 0; pos < len; pos += reserve_len) {
reserve_len = min_t(size_t,
- chan->ops->packet_avail_size(chan->chan, chan->handle),
+ chan->ops->p
riv->p
acket_avail_size(chan->chan, chan->handle),
len - pos);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
sizeof(char), -1, chan->handle);
len - pos);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
sizeof(char), -1, chan->handle);
@@
-1393,7
+1398,7
@@
ssize_t ustctl_write_one_packet_to_channel(
int ret;
reserve_len = min_t(ssize_t,
int ret;
reserve_len = min_t(ssize_t,
- chan->ops->packet_avail_size(chan->chan, chan->handle),
+ chan->ops->p
riv->p
acket_avail_size(chan->chan, chan->handle),
len);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
sizeof(char), -1, chan->handle);
len);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
sizeof(char), -1, chan->handle);
@@
-1413,7
+1418,7
@@
end:
int ustctl_channel_close_wait_fd(struct ustctl_consumer_channel *consumer_chan)
{
int ustctl_channel_close_wait_fd(struct ustctl_consumer_channel *consumer_chan)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
int ret;
chan = consumer_chan->chan->chan;
int ret;
chan = consumer_chan->chan->chan;
@@
-1426,7
+1431,7
@@
int ustctl_channel_close_wait_fd(struct ustctl_consumer_channel *consumer_chan)
int ustctl_channel_close_wakeup_fd(struct ustctl_consumer_channel *consumer_chan)
{
int ustctl_channel_close_wakeup_fd(struct ustctl_consumer_channel *consumer_chan)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
int ret;
chan = consumer_chan->chan->chan;
int ret;
chan = consumer_chan->chan->chan;
@@
-1439,7
+1444,7
@@
int ustctl_channel_close_wakeup_fd(struct ustctl_consumer_channel *consumer_chan
int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)
{
int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
chan = stream->chan->chan->chan;
return ring_buffer_stream_close_wait_fd(&chan->backend.config,
chan = stream->chan->chan->chan;
return ring_buffer_stream_close_wait_fd(&chan->backend.config,
@@
-1448,7
+1453,7
@@
int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)
int ustctl_stream_close_wakeup_fd(struct ustctl_consumer_stream *stream)
{
int ustctl_stream_close_wakeup_fd(struct ustctl_consumer_stream *stream)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
chan = stream->chan->chan->chan;
return ring_buffer_stream_close_wakeup_fd(&chan->backend.config,
chan = stream->chan->chan->chan;
return ring_buffer_stream_close_wakeup_fd(&chan->backend.config,
@@
-1461,7
+1466,7
@@
struct ustctl_consumer_stream *
{
struct ustctl_consumer_stream *stream;
struct lttng_ust_shm_handle *handle;
{
struct ustctl_consumer_stream *stream;
struct lttng_ust_shm_handle *handle;
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
int shm_fd, wait_fd, wakeup_fd;
uint64_t memory_map_size;
struct lttng_ust_lib_ring_buffer *buf;
int shm_fd, wait_fd, wakeup_fd;
uint64_t memory_map_size;
struct lttng_ust_lib_ring_buffer *buf;
@@
-1574,7
+1579,7
@@
int ustctl_get_mmap_len(struct ustctl_consumer_stream *stream,
{
struct ustctl_consumer_channel *consumer_chan;
unsigned long mmap_buf_len;
{
struct ustctl_consumer_channel *consumer_chan;
unsigned long mmap_buf_len;
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
if (!stream)
return -EINVAL;
if (!stream)
return -EINVAL;
@@
-1596,7
+1601,7
@@
int ustctl_get_max_subbuf_size(struct ustctl_consumer_stream *stream,
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
if (!stream)
return -EINVAL;
if (!stream)
return -EINVAL;
@@
-1615,7
+1620,7
@@
int ustctl_get_max_subbuf_size(struct ustctl_consumer_stream *stream,
int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream,
unsigned long *off)
{
int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream,
unsigned long *off)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
unsigned long sb_bindex;
struct lttng_ust_lib_ring_buffer *buf;
struct ustctl_consumer_channel *consumer_chan;
unsigned long sb_bindex;
struct lttng_ust_lib_ring_buffer *buf;
struct ustctl_consumer_channel *consumer_chan;
@@
-1647,7
+1652,7
@@
int ustctl_get_subbuf_size(struct ustctl_consumer_stream *stream,
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
struct lttng_ust_lib_ring_buffer *buf;
if (!stream)
struct lttng_ust_lib_ring_buffer *buf;
if (!stream)
@@
-1666,7
+1671,7
@@
int ustctl_get_padded_subbuf_size(struct ustctl_consumer_stream *stream,
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
unsigned long *len)
{
struct ustctl_consumer_channel *consumer_chan;
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
struct lttng_ust_lib_ring_buffer *buf;
if (!stream)
struct lttng_ust_lib_ring_buffer *buf;
if (!stream)
@@
-1831,7
+1836,7
@@
struct lttng_ust_client_lib_ring_buffer_client_cb *get_client_cb(
struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle)
{
struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle)
{
- struct channel *chan;
+ struct
lttng_ust_lib_ring_buffer_
channel *chan;
const struct lttng_ust_lib_ring_buffer_config *config;
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
const struct lttng_ust_lib_ring_buffer_config *config;
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
This page took
0.025449 seconds
and
4
git commands to generate.