projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send bitness upon registration
[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 d0239cda76f51d25129626f4a0da5659cef564d6..0b53269d60a75e2c63abfbe3ddc839670e97cf92 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-37,14
+37,14
@@
#include <signal.h>
#include <urcu/uatomic.h>
#include <urcu/futex.h>
#include <signal.h>
#include <urcu/uatomic.h>
#include <urcu/futex.h>
+#include <urcu/compiler.h>
-#include <ust-comm.h>
#include <lttng/ust-events.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-abi.h>
-#include <lttng/tracepoint.h>
-#include <lttng/tracepoint-internal.h>
#include <lttng/ust.h>
#include <lttng/ust.h>
+#include <ust-comm.h>
+#include <usterr-signal-safe.h>
+#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
/*
#include "ltt-tracer-core.h"
/*
@@
-167,6
+167,7
@@
int register_app_to_sessiond(int socket)
pid_t ppid;
uid_t uid;
gid_t gid;
pid_t ppid;
uid_t uid;
gid_t gid;
+ uint32_t bits_per_long;
char name[16]; /* process name */
} reg_msg;
char name[16]; /* process name */
} reg_msg;
@@
-176,6
+177,7
@@
int register_app_to_sessiond(int socket)
reg_msg.ppid = getppid();
reg_msg.uid = getuid();
reg_msg.gid = getgid();
reg_msg.ppid = getppid();
reg_msg.uid = getuid();
reg_msg.gid = getgid();
+ reg_msg.bits_per_long = CAA_BITS_PER_LONG;
prctl_ret = prctl(PR_GET_NAME, (unsigned long) reg_msg.name, 0, 0, 0);
if (prctl_ret) {
ERR("Error executing prctl");
prctl_ret = prctl(PR_GET_NAME, (unsigned long) reg_msg.name, 0, 0, 0);
if (prctl_ret) {
ERR("Error executing prctl");
@@
-301,7
+303,7
@@
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;
case LTTNG_UST_TRACEPOINT_LIST_GET:
lur.u.version = lum->u.version;
break;
case LTTNG_UST_TRACEPOINT_LIST_GET:
@@
-904,7
+906,7
@@
static void ust_after_fork_common(sigset_t *restore_sigset)
DBG("process %d", getpid());
ust_unlock();
/* Restore signals */
DBG("process %d", getpid());
ust_unlock();
/* Restore signals */
- ret = sigprocmask(SIG_SETMASK,
&
restore_sigset, NULL);
+ ret = sigprocmask(SIG_SETMASK, restore_sigset, NULL);
if (ret == -1) {
PERROR("sigprocmask");
}
if (ret == -1) {
PERROR("sigprocmask");
}
This page took
0.02421 seconds
and
4
git commands to generate.