projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port: fix pthread_setname_np integration
[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 79f0f28ad124195cfb9d24bd25b776aaa7d4b721..b265bcd3c61e254c9e8dc889d56fef389f2c18e1 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-20,7
+20,8
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#define _GNU_SOURCE
+#include <stddef.h>
+#include <stdint.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/mman.h>
@@
-263,6
+264,8
@@
struct sock_info {
/* Keep track of lazy state dump not performed yet. */
int statedump_pending;
int initial_statedump_done;
/* Keep track of lazy state dump not performed yet. */
int statedump_pending;
int initial_statedump_done;
+ /* Keep procname for statedump */
+ char procname[LTTNG_UST_ABI_PROCNAME_LEN];
};
/* Socket from app (connect) to session daemon (listen) for communication */
};
/* Socket from app (connect) to session daemon (listen) for communication */
@@
-283,6
+286,7
@@
struct sock_info global_apps = {
.statedump_pending = 0,
.initial_statedump_done = 0,
.statedump_pending = 0,
.initial_statedump_done = 0,
+ .procname[0] = '\0'
};
/* TODO: allow global_apps_sock_path override */
};
/* TODO: allow global_apps_sock_path override */
@@
-300,6
+304,7
@@
struct sock_info local_apps = {
.statedump_pending = 0,
.initial_statedump_done = 0,
.statedump_pending = 0,
.initial_statedump_done = 0,
+ .procname[0] = '\0'
};
static int wait_poll_fallback;
};
static int wait_poll_fallback;
@@
-428,6
+433,7
@@
void lttng_ust_fixup_tls(void)
lttng_fixup_cgroup_ns_tls();
lttng_fixup_ipc_ns_tls();
lttng_fixup_net_ns_tls();
lttng_fixup_cgroup_ns_tls();
lttng_fixup_ipc_ns_tls();
lttng_fixup_net_ns_tls();
+ lttng_fixup_time_ns_tls();
lttng_fixup_uts_ns_tls();
}
lttng_fixup_uts_ns_tls();
}
@@
-438,6
+444,15
@@
int lttng_get_notify_socket(void *owner)
return info->notify_socket;
}
return info->notify_socket;
}
+
+LTTNG_HIDDEN
+char* lttng_ust_sockinfo_get_procname(void *owner)
+{
+ struct sock_info *info = owner;
+
+ return info->procname;
+}
+
static
void print_cmd(int cmd, int handle)
{
static
void print_cmd(int cmd, int handle)
{
@@
-467,6
+482,7
@@
int setup_global_apps(void)
}
global_apps.allowed = 1;
}
global_apps.allowed = 1;
+ lttng_pthread_getname_np(global_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
error:
return ret;
}
error:
return ret;
}
@@
-511,6
+527,8
@@
int setup_local_apps(void)
ret = -EIO;
goto end;
}
ret = -EIO;
goto end;
}
+
+ lttng_pthread_getname_np(local_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
end:
return ret;
}
end:
return ret;
}
@@
-2047,6
+2065,7
@@
void ust_context_ns_reset(void)
lttng_context_mnt_ns_reset();
lttng_context_net_ns_reset();
lttng_context_user_ns_reset();
lttng_context_mnt_ns_reset();
lttng_context_net_ns_reset();
lttng_context_user_ns_reset();
+ lttng_context_time_ns_reset();
lttng_context_uts_ns_reset();
}
lttng_context_uts_ns_reset();
}
This page took
0.024616 seconds
and
4
git commands to generate.