summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorroot <shfbai@gmail.com>2016-01-13 00:49:28 -0800
committerroot <shfbai@gmail.com>2016-01-13 00:49:28 -0800
commit28e80bf96dba35f8937518421a2ee5a3a9c36c4d (patch)
treec22287f0c38f1ffecc0faebcddb288700838f281 /src
parent152e9f67f885eea48da815412740ccd3029bf46d (diff)
downloadredis-28e80bf96dba35f8937518421a2ee5a3a9c36c4d.tar.gz
fix linux compile bug
Diffstat (limited to 'src')
-rw-r--r--src/lazyfree.c12
-rw-r--r--src/zmalloc.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lazyfree.c b/src/lazyfree.c
index e471ba004..dba3f00e2 100644
--- a/src/lazyfree.c
+++ b/src/lazyfree.c
@@ -65,7 +65,7 @@ int dbAsyncDelete(redisDb *db, robj *key) {
/* If releasing the object is too much work, let's put it into the
* lazy free list. */
if (free_effort > LAZYFREE_THRESHOLD) {
- atomicIncr(lazyfree_objects,1,&lazyfree_objects_mutex);
+ atomicIncr(lazyfree_objects,1,lazyfree_objects_mutex);
bioCreateBackgroundJob(BIO_LAZY_FREE,val,NULL,NULL);
dictSetVal(db->dict,de,NULL);
}
@@ -89,7 +89,7 @@ void emptyDbAsync(redisDb *db) {
db->dict = dictCreate(&dbDictType,NULL);
db->expires = dictCreate(&keyptrDictType,NULL);
atomicIncr(lazyfree_objects,dictSize(oldht1),
- &lazyfree_objects_mutex);
+ lazyfree_objects_mutex);
bioCreateBackgroundJob(BIO_LAZY_FREE,NULL,oldht1,oldht2);
}
@@ -99,7 +99,7 @@ void slotToKeyFlushAsync(void) {
zskiplist *oldsl = server.cluster->slots_to_keys;
server.cluster->slots_to_keys = zslCreate();
atomicIncr(lazyfree_objects,oldsl->length,
- &lazyfree_objects_mutex);
+ lazyfree_objects_mutex);
bioCreateBackgroundJob(BIO_LAZY_FREE,NULL,NULL,oldsl);
}
@@ -107,7 +107,7 @@ void slotToKeyFlushAsync(void) {
* updating the count of objects to release. */
void lazyfreeFreeObjectFromBioThread(robj *o) {
decrRefCount(o);
- atomicDecr(lazyfree_objects,1,&lazyfree_objects_mutex);
+ atomicDecr(lazyfree_objects,1,lazyfree_objects_mutex);
}
/* Release a database from the lazyfree thread. The 'db' pointer is the
@@ -119,7 +119,7 @@ void lazyfreeFreeDatabaseFromBioThread(dict *ht1, dict *ht2) {
size_t numkeys = dictSize(ht1);
dictRelease(ht1);
dictRelease(ht2);
- atomicDecr(lazyfree_objects,numkeys,&lazyfree_objects_mutex);
+ atomicDecr(lazyfree_objects,numkeys,lazyfree_objects_mutex);
}
/* Release the skiplist mapping Redis Cluster keys to slots in the
@@ -127,5 +127,5 @@ void lazyfreeFreeDatabaseFromBioThread(dict *ht1, dict *ht2) {
void lazyfreeFreeSlotsMapFromBioThread(zskiplist *sl) {
size_t len = sl->length;
zslFree(sl);
- atomicDecr(lazyfree_objects,len,&lazyfree_objects_mutex);
+ atomicDecr(lazyfree_objects,len,lazyfree_objects_mutex);
}
diff --git a/src/zmalloc.c b/src/zmalloc.c
index da62447e1..ab4af99e2 100644
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -72,7 +72,7 @@ void zlibc_free(void *ptr) {
size_t _n = (__n); \
if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
if (zmalloc_thread_safe) { \
- atomicIncr(used_memory,__n,&used_memory_mutex); \
+ atomicIncr(used_memory,__n,used_memory_mutex); \
} else { \
used_memory += _n; \
} \
@@ -82,7 +82,7 @@ void zlibc_free(void *ptr) {
size_t _n = (__n); \
if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
if (zmalloc_thread_safe) { \
- atomicDecr(used_memory,__n,&used_memory_mutex); \
+ atomicDecr(used_memory,__n,used_memory_mutex); \
} else { \
used_memory -= _n; \
} \
@@ -202,7 +202,7 @@ size_t zmalloc_used_memory(void) {
size_t um;
if (zmalloc_thread_safe) {
- atomicGet(used_memory,um,&used_memory_mutex);
+ atomicGet(used_memory,um,used_memory_mutex);
} else {
um = used_memory;
}