static int got_timeout_env;
extern void lttng_ring_buffer_client_overwrite_init(void);
+extern void lttng_ring_buffer_client_overwrite_rt_init(void);
extern void lttng_ring_buffer_client_discard_init(void);
+extern void lttng_ring_buffer_client_discard_rt_init(void);
extern void lttng_ring_buffer_metadata_client_init(void);
extern void lttng_ring_buffer_client_overwrite_exit(void);
+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);
/*
if (lum->handle == LTTNG_UST_ROOT_HANDLE)
ret = -EPERM;
else
- ret = lttng_ust_objd_unref(lum->handle);
+ ret = lttng_ust_objd_unref(lum->handle, 1);
break;
case LTTNG_UST_FILTER:
{
goto error;
}
ret = len;
+ free(bytecode);
goto end;
} else {
DBG("incorrect filter data message size: %zd", len);
case LTTNG_UST_CHANNEL:
{
void *chan_data;
+ int wakeup_fd;
len = ustcomm_recv_channel_from_sessiond(sock,
- &chan_data, lum->u.channel.len);
+ &chan_data, lum->u.channel.len,
+ &wakeup_fd);
switch (len) {
case 0: /* orderly shutdown */
ret = 0;
}
}
args.channel.chan_data = chan_data;
+ args.channel.wakeup_fd = wakeup_fd;
if (ops->cmd)
ret = ops->cmd(lum->handle, lum->cmd,
(unsigned long) &lum->u,
sock_info->notify_socket = -1;
}
if (sock_info->root_handle != -1) {
- ret = lttng_ust_objd_unref(sock_info->root_handle);
+ ret = lttng_ust_objd_unref(sock_info->root_handle, 1);
if (ret) {
ERR("Error unref root handle");
}
}
/* Register */
- timeout = get_notify_sock_timeout();
for (i = 0; i < 2; i++) {
ret = ustcomm_connect_unix_sock(sock_info->sock_path);
if (ret < 0) {
goto restart;
}
open_sock[i] = ret;
- if (timeout > 0) {
- ret = ustcomm_setsockopt_rcv_timeout(open_sock[i],
- timeout);
- if (ret < 0) {
- WARN("Error setting socket receive timeout");
- }
- ret = ustcomm_setsockopt_snd_timeout(open_sock[i],
- timeout);
- if (ret < 0) {
- WARN("Error setting socket send timeout");
- }
- } else if (timeout == -1) {
- ret = fcntl(open_sock[i], F_SETFL, O_NONBLOCK);
- if (ret < 0) {
- WARN("Error setting socket to non-blocking");
- }
- } else {
- if (timeout != 0) {
- WARN("Unsuppoorted timeout value %ld",
- timeout);
- }
- }
}
sock_info->socket = open_sock[0];
sock_info->notify_socket = open_sock[1];
+ timeout = get_notify_sock_timeout();
+ if (timeout >= 0) {
+ /*
+ * Give at least 10ms to sessiond to reply to
+ * notifications.
+ */
+ if (timeout < 10)
+ timeout = 10;
+ ret = ustcomm_setsockopt_rcv_timeout(sock_info->notify_socket,
+ timeout);
+ if (ret < 0) {
+ WARN("Error setting socket receive timeout");
+ }
+ ret = ustcomm_setsockopt_snd_timeout(sock_info->notify_socket,
+ timeout);
+ if (ret < 0) {
+ WARN("Error setting socket send timeout");
+ }
+ } else if (timeout < -1) {
+ WARN("Unsuppoorted timeout value %ld", timeout);
+ }
+
/*
* Create only one root handle per listener thread for the whole
* process lifetime, so we ensure we get ID which is statically
init_tracepoint();
lttng_ring_buffer_metadata_client_init();
lttng_ring_buffer_client_overwrite_init();
+ lttng_ring_buffer_client_overwrite_rt_init();
lttng_ring_buffer_client_discard_init();
+ lttng_ring_buffer_client_discard_rt_init();
+ lttng_context_init();
timeout_mode = get_constructor_timeout(&constructor_timeout);
*/
lttng_ust_abi_exit();
lttng_ust_events_exit();
+ lttng_context_exit();
+ lttng_ring_buffer_client_discard_rt_exit();
lttng_ring_buffer_client_discard_exit();
+ lttng_ring_buffer_client_overwrite_rt_exit();
lttng_ring_buffer_client_overwrite_exit();
lttng_ring_buffer_metadata_client_exit();
exit_tracepoint();