projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More compile fixes
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-comm.c
diff --git
a/liblttng-ust/lttng-ust-comm.c
b/liblttng-ust/lttng-ust-comm.c
index d35511b2f1afecc7bf16a10317955130c6cbc175..17c7350de06a8078c6ddc543e8c1468b44430593 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-38,12
+38,11
@@
#include <urcu/uatomic.h>
#include <urcu/futex.h>
#include <urcu/uatomic.h>
#include <urcu/futex.h>
-#include <
lttng/
ust-comm.h>
+#include <ust-comm.h>
#include <lttng/ust-events.h>
#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-events.h>
#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-abi.h>
-#include <lttng/tracepoint.h>
-#include <lttng/tracepoint-internal.h>
+#include "tracepoint-internal.h"
#include <lttng/ust.h>
#include "ltt-tracer-core.h"
#include <lttng/ust.h>
#include "ltt-tracer-core.h"
@@
-301,9
+300,14
@@
end:
shm_fd = lum->u.channel.shm_fd;
wait_fd = lum->u.channel.wait_fd;
break;
shm_fd = lum->u.channel.shm_fd;
wait_fd = lum->u.channel.wait_fd;
break;
- case LTTNG_UST_VERSION:
+ case LTTNG_UST_
TRACER_
VERSION:
lur.u.version = lum->u.version;
break;
lur.u.version = lum->u.version;
break;
+ case LTTNG_UST_TRACEPOINT_LIST_GET:
+ memcpy(lur.u.tracepoint_list_entry,
+ lum->u.tracepoint_list_entry,
+ LTTNG_UST_SYM_NAME_LEN);
+ break;
}
ret = send_reply(sock, &lur);
if (ret < 0) {
}
ret = send_reply(sock, &lur);
if (ret < 0) {
@@
-625,7
+629,7
@@
restart:
/* Register */
ret = ustcomm_connect_unix_sock(sock_info->sock_path);
if (ret < 0) {
/* Register */
ret = ustcomm_connect_unix_sock(sock_info->sock_path);
if (ret < 0) {
-
ERR("Error connecting
to %s apps socket", sock_info->name);
+
DBG("Info: sessiond not accepting connections
to %s apps socket", sock_info->name);
prev_connect_failed = 1;
/*
* If we cannot find the sessiond daemon, don't delay
prev_connect_failed = 1;
/*
* If we cannot find the sessiond daemon, don't delay
@@
-871,7
+875,7
@@
void __attribute__((destructor)) lttng_ust_exit(void)
* in the middle of an tracepoint or ust tracing state modification.
* Holding this mutex protects these structures across fork and clone.
*/
* in the middle of an tracepoint or ust tracing state modification.
* Holding this mutex protects these structures across fork and clone.
*/
-void ust_before_fork(
ust_fork_info_t *fork_info
)
+void ust_before_fork(
sigset_t *save_sigset
)
{
/*
* Disable signals. This is to avoid that the child intervenes
{
/*
* Disable signals. This is to avoid that the child intervenes
@@
-884,7
+888,7
@@
void ust_before_fork(ust_fork_info_t *fork_info)
/* Disable signals */
sigfillset(&all_sigs);
/* Disable signals */
sigfillset(&all_sigs);
- ret = sigprocmask(SIG_BLOCK, &all_sigs,
&fork_info->orig_sigs
);
+ ret = sigprocmask(SIG_BLOCK, &all_sigs,
save_sigset
);
if (ret == -1) {
PERROR("sigprocmask");
}
if (ret == -1) {
PERROR("sigprocmask");
}
@@
-892,25
+896,25
@@
void ust_before_fork(ust_fork_info_t *fork_info)
rcu_bp_before_fork();
}
rcu_bp_before_fork();
}
-static void ust_after_fork_common(
ust_fork_info_t *fork_info
)
+static void ust_after_fork_common(
sigset_t *restore_sigset
)
{
int ret;
DBG("process %d", getpid());
ust_unlock();
/* Restore signals */
{
int ret;
DBG("process %d", getpid());
ust_unlock();
/* Restore signals */
- ret = sigprocmask(SIG_SETMASK,
&fork_info->orig_sigs
, NULL);
+ ret = sigprocmask(SIG_SETMASK,
restore_sigset
, NULL);
if (ret == -1) {
PERROR("sigprocmask");
}
}
if (ret == -1) {
PERROR("sigprocmask");
}
}
-void ust_after_fork_parent(
ust_fork_info_t *fork_info
)
+void ust_after_fork_parent(
sigset_t *restore_sigset
)
{
DBG("process %d", getpid());
rcu_bp_after_fork_parent();
/* Release mutexes and reenable signals */
{
DBG("process %d", getpid());
rcu_bp_after_fork_parent();
/* Release mutexes and reenable signals */
- ust_after_fork_common(
fork_info
);
+ ust_after_fork_common(
restore_sigset
);
}
/*
}
/*
@@
-922,7
+926,7
@@
void ust_after_fork_parent(ust_fork_info_t *fork_info)
* This is meant for forks() that have tracing in the child between the
* fork and following exec call (if there is any).
*/
* This is meant for forks() that have tracing in the child between the
* fork and following exec call (if there is any).
*/
-void ust_after_fork_child(
ust_fork_info_t *fork_info
)
+void ust_after_fork_child(
sigset_t *restore_sigset
)
{
DBG("process %d", getpid());
/* Release urcu mutexes */
{
DBG("process %d", getpid());
/* Release urcu mutexes */
@@
-930,6
+934,6
@@
void ust_after_fork_child(ust_fork_info_t *fork_info)
lttng_ust_cleanup(0);
lttng_context_vtid_reset();
/* Release mutexes and reenable signals */
lttng_ust_cleanup(0);
lttng_context_vtid_reset();
/* Release mutexes and reenable signals */
- ust_after_fork_common(
fork_info
);
+ ust_after_fork_common(
restore_sigset
);
lttng_ust_init();
}
lttng_ust_init();
}
This page took
0.025888 seconds
and
4
git commands to generate.