projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into dev
[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 b90df8610edb6cee07e0bef8ac4ec82cb787b5a2..1815801a8fe08a06df22b6d1614efc969ca75b4d 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-22,7
+22,6
@@
#define _LGPL_SOURCE
#include <sys/types.h>
#include <sys/socket.h>
#define _LGPL_SOURCE
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/prctl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
@@
-46,6
+45,7
@@
#include <usterr-signal-safe.h>
#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
#include <usterr-signal-safe.h>
#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
+#include "compat.h"
#include "../libringbuffer/tlsfixup.h"
/*
#include "../libringbuffer/tlsfixup.h"
/*
@@
-160,7
+160,6
@@
static
int register_app_to_sessiond(int socket)
{
ssize_t ret;
int register_app_to_sessiond(int socket)
{
ssize_t ret;
- int prctl_ret;
struct {
uint32_t major;
uint32_t minor;
struct {
uint32_t major;
uint32_t minor;
@@
-179,11
+178,7
@@
int register_app_to_sessiond(int socket)
reg_msg.uid = getuid();
reg_msg.gid = getgid();
reg_msg.bits_per_long = CAA_BITS_PER_LONG;
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");
- return -errno;
- }
+ lttng_ust_getprocname(reg_msg.name);
ret = ustcomm_send_unix_sock(socket, ®_msg, sizeof(reg_msg));
if (ret >= 0 && ret != sizeof(reg_msg))
ret = ustcomm_send_unix_sock(socket, ®_msg, sizeof(reg_msg));
if (ret >= 0 && ret != sizeof(reg_msg))
@@
-840,6
+835,7
@@
void __attribute__((constructor)) lttng_ust_init(void)
*/
lttng_fixup_event_tls();
lttng_fixup_ringbuffer_tls();
*/
lttng_fixup_event_tls();
lttng_fixup_ringbuffer_tls();
+ lttng_fixup_vtid_tls();
/*
* We want precise control over the order in which we construct
/*
* We want precise control over the order in which we construct
This page took
0.023868 seconds
and
4
git commands to generate.