Version 2.0.8

[lttng-ust.git] / liblttng-ust / lttng-context-procname.c

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index b737084bf69aae013cee43c11e7ffa3484067ce5..caf86a95b65a509cb650e43a8c2ce10691d31dee 100644 (file)
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -1,17 +1,32 @@
 /*
- * (C) Copyright       2009-2011 -
- *             Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * lttng-context-procname.c
  *
  * LTTng UST procname context.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2009-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <sys/prctl.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
 #include <assert.h>
-#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 +39,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 +59,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 +71,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 +94,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;