X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=b737084bf69aae013cee43c11e7ffa3484067ce5;hb=08114193d6fd56309b520ae50e7117b8bc7f34a5;hp=b9bae82eba91be79fdd2ca1749fe2e5f2066b570;hpb=75181c4b1b6e046ae8561c486ced003a83b1a696;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c index b9bae82e..b737084b 100644 --- a/liblttng-ust/lttng-context-procname.c +++ b/liblttng-ust/lttng-context-procname.c @@ -7,13 +7,11 @@ * Dual LGPL v2.1/GPL v2 license. */ -#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 @@ -26,12 +24,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; } @@ -46,7 +41,7 @@ size_t procname_get_size(size_t offset) { size_t size = 0; - size += PROCNAME_LEN; + size += LTTNG_UST_PROCNAME_LEN; return size; } @@ -58,7 +53,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) @@ -81,7 +76,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;