projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: do not use shell eval for known values
[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 96cd1ee2c8f4979f7c7fbaf7c9367c2d9b59061b..13461a6878fded8e47bf10c902b054940d4c4c16 100644
(file)
--- a/
liblttng-ust/lttng-context-procname.c
+++ b/
liblttng-ust/lttng-context-procname.c
@@
-23,6
+23,7
@@
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-config.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-config.h>
+#include <urcu/tls-compat.h>
#include <assert.h>
#include "compat.h"
#include <assert.h>
#include "compat.h"
@@
-35,25
+36,26
@@
* be set for a thread before the first event is logged within this
* thread.
*/
* be set for a thread before the first event is logged within this
* thread.
*/
-static __thread char cached_procname[17];
+typedef char procname_array[17];
+static DEFINE_URCU_TLS(procname_array, cached_procname);
static inline
char *wrapper_getprocname(void)
{
static inline
char *wrapper_getprocname(void)
{
- if (caa_unlikely(!
cached_procname
[0])) {
- lttng_ust_getprocname(
cached_procname
);
-
cached_procname
[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
+ if (caa_unlikely(!
URCU_TLS(cached_procname)
[0])) {
+ lttng_ust_getprocname(
URCU_TLS(cached_procname)
);
+
URCU_TLS(cached_procname)
[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
}
}
- return
cached_procname
;
+ return
URCU_TLS(cached_procname)
;
}
void lttng_context_procname_reset(void)
{
}
void lttng_context_procname_reset(void)
{
-
cached_procname
[0] = '\0';
+
URCU_TLS(cached_procname)
[0] = '\0';
}
static
}
static
-size_t procname_get_size(size_t offset)
+size_t procname_get_size(s
truct lttng_ctx_field *field, s
ize_t offset)
{
size_t size = 0;
{
size_t size = 0;
@@
-64,7
+66,7
@@
size_t procname_get_size(size_t offset)
static
void procname_record(struct lttng_ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
static
void procname_record(struct lttng_ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct ltt_channel *chan)
+ struct ltt
ng
_channel *chan)
{
char *procname;
{
char *procname;
@@
-72,6
+74,16
@@
void procname_record(struct lttng_ctx_field *field,
chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN);
}
chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN);
}
+static
+void procname_get_value(struct lttng_ctx_field *field,
+ struct lttng_ctx_value *value)
+{
+ char *procname;
+
+ procname = wrapper_getprocname();
+ value->u.str = procname;
+}
+
int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
{
struct lttng_ctx_field *field;
int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
{
struct lttng_ctx_field *field;
@@
-95,6
+107,8
@@
int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
field->event_field.type.u.array.length = LTTNG_UST_PROCNAME_LEN;
field->get_size = procname_get_size;
field->record = procname_record;
field->event_field.type.u.array.length = LTTNG_UST_PROCNAME_LEN;
field->get_size = procname_get_size;
field->record = procname_record;
+ field->get_value = procname_get_value;
+ lttng_context_update(*ctx);
return 0;
}
return 0;
}
@@
-103,5
+117,5
@@
int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
*/
void lttng_fixup_procname_tls(void)
{
*/
void lttng_fixup_procname_tls(void)
{
- asm volatile ("" : : "m" (
cached_procname
[0]));
+ asm volatile ("" : : "m" (
URCU_TLS(cached_procname)
[0]));
}
}
This page took
0.024546 seconds
and
4
git commands to generate.