From 69df119308216b0a9261dfed79de0d810eff9540 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 20 Feb 2012 19:52:30 -0500 Subject: [PATCH] Add get proc name wrapper for FreeBSD commit 08114193d6fd56309b520ae50e7117b8bc7f34a5 upstream. [ Edit by Christian Babeux: Resolve includes conflict in liblttng-ust/lttng-ust-comm.c ] Signed-off-by: Mathieu Desnoyers Signed-off-by: Christian Babeux --- liblttng-ust/compat.h | 52 ++++++++++++++++++++++++++- liblttng-ust/ltt-events.c | 10 +++--- liblttng-ust/lttng-context-procname.c | 17 ++++----- liblttng-ust/lttng-ust-comm.c | 9 ++--- 4 files changed, 63 insertions(+), 25 deletions(-) diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h index 19d4da82..803cc12d 100644 --- a/liblttng-ust/compat.h +++ b/liblttng-ust/compat.h @@ -19,9 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +/* + * sched_getcpu. + */ +#ifdef __linux__ #ifdef __UCLIBC__ +#include #define __getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) static inline int sched_getcpu(void) @@ -32,4 +36,50 @@ int sched_getcpu(void) return (s == -1) ? s : c; } #endif /* __UCLIBC__ */ + +#else +#error "Please add support for your OS into liblttng-ust/compat.h." +#endif + +/* + * lttng_ust_getprocname. + */ +#ifdef __linux__ + +#include + +#define LTTNG_UST_PROCNAME_LEN 17 + +static inline +void lttng_ust_getprocname(char *name) +{ + (void) prctl(PR_GET_NAME, (unsigned long) name, 0, 0, 0); +} + +#elif defined(__FreeBSD__) +#include +#include + +/* + * Limit imposed by Linux UST-sessiond ABI. + */ +#define LTTNG_UST_PROCNAME_LEN 17 + +/* + * Acts like linux prctl, the string is not necessarily 0-terminated if + * 16-byte long. + */ +static inline +void lttng_ust_getprocname(char *name) +{ + const char *bsd_name; + + bsd_name = getprogname(); + if (!bsd_name) + name[0] = '\0'; + memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1); +} + +#endif + #endif /* _UST_COMPAT_H */ diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c index 775e73ca..5a624c49 100644 --- a/liblttng-ust/ltt-events.c +++ b/liblttng-ust/ltt-events.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "clock.h" @@ -48,6 +47,7 @@ #include #include #include "error.h" +#include "compat.h" #include "tracepoint-internal.h" #include "ltt-tracer.h" @@ -56,8 +56,6 @@ #include "../libringbuffer/shm.h" #include "jhash.h" -#define PROCNAME_LEN 17 - /* * The sessions mutex is the centralized mutex across UST tracing * control and probe registration. All operations within this file are @@ -1106,7 +1104,7 @@ int _ltt_session_metadata_statedump(struct ltt_session *session) struct ltt_channel *chan; struct ltt_event *event; int ret = 0; - char procname[PROCNAME_LEN] = ""; + char procname[LTTNG_UST_PROCNAME_LEN] = ""; if (!CMM_ACCESS_ONCE(session->active)) return 0; @@ -1160,8 +1158,8 @@ int _ltt_session_metadata_statedump(struct ltt_session *session) goto end; /* ignore error, just use empty string if error. */ - (void) prctl(PR_GET_NAME, (unsigned long) procname, 0, 0, 0); - procname[PROCNAME_LEN - 1] = '\0'; + lttng_ust_getprocname(procname); + procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0'; ret = lttng_metadata_printf(session, "env {\n" " vpid = %d;\n" diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c index caf86a95..d165be88 100644 --- a/liblttng-ust/lttng-context-procname.c +++ b/liblttng-ust/lttng-context-procname.c @@ -20,13 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include #include #include - -#define PROCNAME_LEN 17 /* includes \0 */ +#include "compat.h" /* * We cache the result to ensure we don't trigger a system call for @@ -39,12 +37,9 @@ static char cached_procname[17]; static inline char *wrapper_getprocname(void) { - int ret; - if (caa_unlikely(!cached_procname[0])) { - ret = prctl(PR_GET_NAME, (unsigned long) cached_procname, - 0, 0, 0); - assert(!ret); + lttng_ust_getprocname(cached_procname); + cached_procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0'; } return cached_procname; } @@ -59,7 +54,7 @@ size_t procname_get_size(size_t offset) { size_t size = 0; - size += PROCNAME_LEN; + size += LTTNG_UST_PROCNAME_LEN; return size; } @@ -71,7 +66,7 @@ void procname_record(struct lttng_ctx_field *field, char *procname; procname = wrapper_getprocname(); - chan->ops->event_write(ctx, procname, PROCNAME_LEN); + chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN); } int lttng_add_procname_to_ctx(struct lttng_ctx **ctx) @@ -94,7 +89,7 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx) field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0; field->event_field.type.u.array.elem_type.u.basic.integer.base = 10; field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8; - field->event_field.type.u.array.length = PROCNAME_LEN; + field->event_field.type.u.array.length = LTTNG_UST_PROCNAME_LEN; field->get_size = procname_get_size; field->record = procname_record; return 0; diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index dece0ee6..af7928c3 100644 --- a/liblttng-ust/lttng-ust-comm.c +++ b/liblttng-ust/lttng-ust-comm.c @@ -22,7 +22,6 @@ #define _LGPL_SOURCE #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include "tracepoint-internal.h" #include "ltt-tracer-core.h" +#include "compat.h" #include "../libringbuffer/tlsfixup.h" /* @@ -177,7 +177,6 @@ static int register_app_to_sessiond(int socket) { ssize_t ret; - int prctl_ret; struct { uint32_t major; uint32_t minor; @@ -196,11 +195,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; - 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)) -- 2.34.1