X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=b9bae82eba91be79fdd2ca1749fe2e5f2066b570;hb=4c1ee94e5ef9ac3efb4a036108a9ff4eb24c238c;hp=b737084bf69aae013cee43c11e7ffa3484067ce5;hpb=e4486ebcdee39064492ed386b11008191fbbad17;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c index b737084b..b9bae82e 100644 --- a/liblttng-ust/lttng-context-procname.c +++ b/liblttng-ust/lttng-context-procname.c @@ -7,11 +7,13 @@ * Dual LGPL v2.1/GPL v2 license. */ +#include #include #include #include #include -#include "compat.h" + +#define PROCNAME_LEN 17 /* includes \0 */ /* * We cache the result to ensure we don't trigger a system call for @@ -24,9 +26,12 @@ static char cached_procname[17]; static inline char *wrapper_getprocname(void) { + int ret; + if (caa_unlikely(!cached_procname[0])) { - lttng_ust_getprocname(cached_procname); - cached_procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0'; + ret = prctl(PR_GET_NAME, (unsigned long) cached_procname, + 0, 0, 0); + assert(!ret); } return cached_procname; } @@ -41,7 +46,7 @@ size_t procname_get_size(size_t offset) { size_t size = 0; - size += LTTNG_UST_PROCNAME_LEN; + size += PROCNAME_LEN; return size; } @@ -53,7 +58,7 @@ void procname_record(struct lttng_ctx_field *field, char *procname; procname = wrapper_getprocname(); - chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN); + chan->ops->event_write(ctx, procname, PROCNAME_LEN); } int lttng_add_procname_to_ctx(struct lttng_ctx **ctx) @@ -76,7 +81,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 = LTTNG_UST_PROCNAME_LEN; + field->event_field.type.u.array.length = PROCNAME_LEN; field->get_size = procname_get_size; field->record = procname_record; return 0;