Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
80ff1fc6
Commit
80ff1fc6
authored
Feb 26, 2012
by
Premysl Hruby
Committed by
antirez
Feb 26, 2012
Browse files
use gcc sync builtins for memory counter when possible
parent
59132e42
Changes
2
Show whitespace changes
Inline
Side-by-side
src/config.h
View file @
80ff1fc6
...
...
@@ -96,4 +96,13 @@
#error "Undefined or invalid BYTE_ORDER"
#endif
#if (__i386 || __amd64) && __GNUC__
#include <features.h>
#if __GNUC_PREREQ(4,1)
#define HAVE_ATOMIC
#endif
#endif
#endif
src/zmalloc.c
View file @
80ff1fc6
...
...
@@ -58,13 +58,29 @@
#define free(ptr) je_free(ptr)
#endif
#ifdef HAVE_ATOMIC
#define update_zmalloc_stat_add(__n) __sync_add_and_fetch(&used_memory, (__n))
#define update_zmalloc_stat_sub(__n) __sync_sub_and_fetch(&used_memory, (__n))
#else
#define update_zmalloc_stat_add(__n) do { \
pthread_mutex_lock(&used_memory_mutex); \
used_memory += (__n); \
pthread_mutex_unlock(&used_memory_mutex); \
} while(0)
#define update_zmalloc_stat_sub(__n) do { \
pthread_mutex_lock(&used_memory_mutex); \
used_memory -= (__n); \
pthread_mutex_unlock(&used_memory_mutex); \
} while(0)
#endif
#define update_zmalloc_stat_alloc(__n,__size) do { \
size_t _n = (__n); \
if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
if (zmalloc_thread_safe) { \
pthread_mutex_lock(&used_memory_mutex); \
used_memory += _n; \
pthread_mutex_unlock(&used_memory_mutex); \
update_zmalloc_stat_add(_n); \
} else { \
used_memory += _n; \
} \
...
...
@@ -74,9 +90,7 @@
size_t _n = (__n); \
if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
if (zmalloc_thread_safe) { \
pthread_mutex_lock(&used_memory_mutex); \
used_memory -= _n; \
pthread_mutex_unlock(&used_memory_mutex); \
update_zmalloc_stat_sub(_n); \
} else { \
used_memory -= _n; \
} \
...
...
@@ -193,9 +207,19 @@ char *zstrdup(const char *s) {
size_t
zmalloc_used_memory
(
void
)
{
size_t
um
;
if
(
zmalloc_thread_safe
)
pthread_mutex_lock
(
&
used_memory_mutex
);
if
(
zmalloc_thread_safe
)
{
#ifdef HAVE_ATOMIC
um
=
__sync_add_and_fetch
(
&
used_memory
,
0
);
#else
pthread_mutex_lock
(
&
used_memory_mutex
);
um
=
used_memory
;
if
(
zmalloc_thread_safe
)
pthread_mutex_unlock
(
&
used_memory_mutex
);
pthread_mutex_unlock
(
&
used_memory_mutex
);
#endif
}
else
{
um
=
used_memory
;
}
return
um
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment