projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: bytecode validator: reject specialized load instructions
[lttng-ust.git]
/
src
/
lib
/
lttng-ust
/
lttng-context-procname.c
diff --git
a/src/lib/lttng-ust/lttng-context-procname.c
b/src/lib/lttng-ust/lttng-context-procname.c
index bbc4687ad20bb2d878a5b249952092d98d45e95c..b5bf77be611b28ee3d6d87ac5415da0470acafc6 100644
(file)
--- a/
src/lib/lttng-ust/lttng-context-procname.c
+++ b/
src/lib/lttng-ust/lttng-context-procname.c
@@
-10,7
+10,7
@@
#include <stddef.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <stddef.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/
ust-
ringbuffer-context.h>
#include <urcu/tls-compat.h>
#include <assert.h>
#include "common/compat/pthread.h"
#include <urcu/tls-compat.h>
#include <assert.h>
#include "common/compat/pthread.h"
@@
-30,7
+30,7
@@
* 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.
*/
-typedef char procname_array[PROCNAME_NESTING_MAX][
17
];
+typedef char procname_array[PROCNAME_NESTING_MAX][
LTTNG_UST_CONTEXT_PROCNAME_LEN
];
static DEFINE_URCU_TLS(procname_array, cached_procname);
static DEFINE_URCU_TLS(procname_array, cached_procname);
@@
-47,8
+47,8
@@
const char *wrapper_getprocname(void)
CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting + 1);
/* Increment nesting before updating cache. */
cmm_barrier();
CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting + 1);
/* Increment nesting before updating cache. */
cmm_barrier();
- lttng_pthread_getname_np(URCU_TLS(cached_procname)[nesting], LTTNG_UST_
ABI
_PROCNAME_LEN);
- URCU_TLS(cached_procname)[nesting][LTTNG_UST_
ABI
_PROCNAME_LEN - 1] = '\0';
+ lttng_pthread_getname_np(URCU_TLS(cached_procname)[nesting], LTTNG_UST_
CONTEXT
_PROCNAME_LEN);
+ URCU_TLS(cached_procname)[nesting][LTTNG_UST_
CONTEXT
_PROCNAME_LEN - 1] = '\0';
/* Decrement nesting after updating cache. */
cmm_barrier();
CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting);
/* Decrement nesting after updating cache. */
cmm_barrier();
CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting);
@@
-67,24
+67,27
@@
void lttng_ust_context_procname_reset(void)
static
size_t procname_get_size(void *priv __attribute__((unused)),
static
size_t procname_get_size(void *priv __attribute__((unused)),
+ struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
size_t offset __attribute__((unused)))
{
size_t offset __attribute__((unused)))
{
- return LTTNG_UST_
ABI
_PROCNAME_LEN;
+ return LTTNG_UST_
CONTEXT
_PROCNAME_LEN;
}
static
void procname_record(void *priv __attribute__((unused)),
}
static
void procname_record(void *priv __attribute__((unused)),
- struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_ust_channel_buffer *chan)
+ struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
+ struct lttng_ust_ring_buffer_ctx *ctx,
+ struct lttng_ust_channel_buffer *chan)
{
const char *procname;
procname = wrapper_getprocname();
{
const char *procname;
procname = wrapper_getprocname();
- chan->ops->event_write(ctx, procname, LTTNG_UST_
ABI
_PROCNAME_LEN, 1);
+ chan->ops->event_write(ctx, procname, LTTNG_UST_
CONTEXT
_PROCNAME_LEN, 1);
}
static
void procname_get_value(void *priv __attribute__((unused)),
}
static
void procname_get_value(void *priv __attribute__((unused)),
+ struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
struct lttng_ust_ctx_value *value)
{
value->u.str = wrapper_getprocname();
struct lttng_ust_ctx_value *value)
{
value->u.str = wrapper_getprocname();
@@
-92,7
+95,7
@@
void procname_get_value(void *priv __attribute__((unused)),
static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
lttng_ust_static_event_field("procname",
static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
lttng_ust_static_event_field("procname",
- lttng_ust_static_type_array_text(LTTNG_UST_
ABI
_PROCNAME_LEN),
+ lttng_ust_static_type_array_text(LTTNG_UST_
CONTEXT
_PROCNAME_LEN),
false, false),
procname_get_size,
procname_record,
false, false),
procname_get_size,
procname_record,
@@
-117,9
+120,9
@@
error_find_context:
}
/*
}
/*
- * Force a read (imply TLS
fixup
for dlopen) of TLS variables.
+ * Force a read (imply TLS
allocation
for dlopen) of TLS variables.
*/
*/
-void lttng_
fixup_procname
_tls(void)
+void lttng_
procname_alloc
_tls(void)
{
asm volatile ("" : : "m" (URCU_TLS(cached_procname)[0]));
}
{
asm volatile ("" : : "m" (URCU_TLS(cached_procname)[0]));
}
This page took
0.025533 seconds
and
4
git commands to generate.