#include "common/macros.h"
#include "common/align.h"
-#define TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM ip
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+
+#define LTTNG_UST_TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TP_IP_PARAM ip
#include "ust_libc.h"
#define STATIC_CALLOC_LEN 4096
}
retval = cur_alloc.malloc(size);
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, malloc,
+ lttng_ust_tracepoint(lttng_ust_libc, malloc,
size, retval, LTTNG_UST_CALLER_IP());
}
URCU_TLS(malloc_nesting)--;
}
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, free,
+ lttng_ust_tracepoint(lttng_ust_libc, free,
ptr, LTTNG_UST_CALLER_IP());
}
}
retval = cur_alloc.calloc(nmemb, size);
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, calloc,
+ lttng_ust_tracepoint(lttng_ust_libc, calloc,
nmemb, size, retval, LTTNG_UST_CALLER_IP());
}
URCU_TLS(malloc_nesting)--;
memcpy(retval, ptr, *old_size);
}
/*
- * Mimick that a NULL pointer has been received, so
+ * Mimic that a NULL pointer has been received, so
* memory allocation analysis based on the trace don't
* get confused by the address from the static
* allocator.
retval = cur_alloc.realloc(ptr, size);
end:
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, realloc,
+ lttng_ust_tracepoint(lttng_ust_libc, realloc,
ptr, size, retval, LTTNG_UST_CALLER_IP());
}
URCU_TLS(malloc_nesting)--;
}
retval = cur_alloc.memalign(alignment, size);
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, memalign,
+ lttng_ust_tracepoint(lttng_ust_libc, memalign,
alignment, size, retval,
LTTNG_UST_CALLER_IP());
}
}
retval = cur_alloc.posix_memalign(memptr, alignment, size);
if (URCU_TLS(malloc_nesting) == 1) {
- tracepoint(lttng_ust_libc, posix_memalign,
+ lttng_ust_tracepoint(lttng_ust_libc, posix_memalign,
*memptr, alignment, size,
retval, LTTNG_UST_CALLER_IP());
}
}
static
-void lttng_ust_fixup_malloc_nesting_tls(void)
+void lttng_ust_malloc_nesting_alloc_tls(void)
{
- asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
+ __asm__ __volatile__ ("" : : "m" (URCU_TLS(malloc_nesting)));
}
-void lttng_ust_libc_wrapper_malloc_init(void)
+void lttng_ust_libc_wrapper_malloc_ctor(void)
{
/* Initialization already done */
if (cur_alloc.calloc) {
return;
}
- lttng_ust_fixup_malloc_nesting_tls();
+ lttng_ust_malloc_nesting_alloc_tls();
/*
* Ensure the allocator is in place before the process becomes
* multithreaded.