projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add `patient_writev()` function
[lttng-ust.git]
/
liblttng-ust-libc-wrapper
/
lttng-ust-malloc.c
diff --git
a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index f30a2c694372970c7f68581364075a67534dbeb4..1e9a25e5c89dbbefbf6ff819a3a37a2e7d8d8c24 100644
(file)
--- a/
liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/
liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@
-17,7
+17,6
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define _GNU_SOURCE
/*
* Do _not_ define _LGPL_SOURCE because we don't want to create a
* circular dependency loop between this malloc wrapper, liburcu and
/*
* Do _not_ define _LGPL_SOURCE because we don't want to create a
* circular dependency loop between this malloc wrapper, liburcu and
@@
-95,9
+94,9
@@
void ust_malloc_spin_unlock(pthread_mutex_t *lock)
#define calloc static_calloc
#define pthread_mutex_lock ust_malloc_spin_lock
#define pthread_mutex_unlock ust_malloc_spin_unlock
#define calloc static_calloc
#define pthread_mutex_lock ust_malloc_spin_lock
#define pthread_mutex_unlock ust_malloc_spin_unlock
-static DEFINE_URCU_TLS
_IE
(int, malloc_nesting);
-#undef
ust_malloc_spin
_unlock
-#undef
ust_malloc_spin
_lock
+static DEFINE_URCU_TLS(int, malloc_nesting);
+#undef
pthread_mutex
_unlock
+#undef
pthread_mutex
_lock
#undef calloc
/*
#undef calloc
/*
@@
-122,7
+121,7
@@
void *static_calloc_aligned(size_t nmemb, size_t size, size_t alignment)
res_offset = CMM_LOAD_SHARED(static_calloc_buf_offset);
do {
prev_offset = res_offset;
res_offset = CMM_LOAD_SHARED(static_calloc_buf_offset);
do {
prev_offset = res_offset;
- aligned_offset = ALIGN(prev_offset + sizeof(size_t), alignment);
+ aligned_offset =
LTTNG_UST_
ALIGN(prev_offset + sizeof(size_t), alignment);
new_offset = aligned_offset + nmemb * size;
if (new_offset > sizeof(static_calloc_buf)) {
abort();
new_offset = aligned_offset + nmemb * size;
if (new_offset > sizeof(static_calloc_buf)) {
abort();
This page took
0.024177 seconds
and
4
git commands to generate.