X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;fp=liblttng-ust%2Flttng-context-procname.c;h=d165be88277daada8bbb616c2db60572050f9aa2;hb=9501d22f55b3a23f382f631c99b2325d1419b5da;hp=caf86a95b65a509cb650e43a8c2ce10691d31dee;hpb=1c59f149e80dbe4a5fe5a6ed7ccc9face6ffa49d;p=lttng-ust.git 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;