projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated to latest memcached
[awesomized/libmemcached]
/
memcached
/
thread.c
diff --git
a/memcached/thread.c
b/memcached/thread.c
index e362249733d47674f39b683898a85da0c880bf38..f4bbe1e78d4e5ed8ff90ca80933239adc7e9fbc6 100644
(file)
--- a/
memcached/thread.c
+++ b/
memcached/thread.c
@@
-88,7
+88,7
@@
unsigned short refcount_incr(unsigned short *refcount) {
mutex_lock(&atomics_mutex);
(*refcount)++;
res = *refcount;
mutex_lock(&atomics_mutex);
(*refcount)++;
res = *refcount;
-
pthread_
mutex_unlock(&atomics_mutex);
+ mutex_unlock(&atomics_mutex);
return res;
#endif
}
return res;
#endif
}
@@
-103,7
+103,7
@@
unsigned short refcount_decr(unsigned short *refcount) {
mutex_lock(&atomics_mutex);
(*refcount)--;
res = *refcount;
mutex_lock(&atomics_mutex);
(*refcount)--;
res = *refcount;
-
pthread_
mutex_unlock(&atomics_mutex);
+ mutex_unlock(&atomics_mutex);
return res;
#endif
}
return res;
#endif
}
@@
-113,7
+113,7
@@
void item_lock(uint32_t hv) {
}
void item_unlock(uint32_t hv) {
}
void item_unlock(uint32_t hv) {
-
pthread_
mutex_unlock(&item_locks[hv & item_lock_mask]);
+ mutex_unlock(&item_locks[hv & item_lock_mask]);
}
/*
}
/*
@@
-299,9
+299,6
@@
static void *worker_libevent(void *arg) {
}
}
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
/*
* Processes an incoming "handle a new connection" item. This is called when
* input arrives on the libevent wakeup pipe.
/*
* Processes an incoming "handle a new connection" item. This is called when
* input arrives on the libevent wakeup pipe.
@@
-508,7
+505,7
@@
enum store_item_type store_item(item *item, int comm, conn* c) {
void item_flush_expired() {
mutex_lock(&cache_lock);
do_item_flush_expired();
void item_flush_expired() {
mutex_lock(&cache_lock);
do_item_flush_expired();
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
}
/*
}
/*
@@
-519,7
+516,7
@@
char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int
mutex_lock(&cache_lock);
ret = do_item_cachedump(slabs_clsid, limit, bytes);
mutex_lock(&cache_lock);
ret = do_item_cachedump(slabs_clsid, limit, bytes);
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
return ret;
}
return ret;
}
@@
-529,7
+526,7
@@
char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int
void item_stats(ADD_STAT add_stats, void *c) {
mutex_lock(&cache_lock);
do_item_stats(add_stats, c);
void item_stats(ADD_STAT add_stats, void *c) {
mutex_lock(&cache_lock);
do_item_stats(add_stats, c);
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
}
/*
}
/*
@@
-538,7
+535,7
@@
void item_stats(ADD_STAT add_stats, void *c) {
void item_stats_sizes(ADD_STAT add_stats, void *c) {
mutex_lock(&cache_lock);
do_item_stats_sizes(add_stats, c);
void item_stats_sizes(ADD_STAT add_stats, void *c) {
mutex_lock(&cache_lock);
do_item_stats_sizes(add_stats, c);
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
}
/******************************* GLOBAL STATS ******************************/
}
/******************************* GLOBAL STATS ******************************/
@@
-658,9
+655,6
@@
void slab_stats_aggregate(struct thread_stats *stats, struct slab_stats *out) {
}
}
}
}
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
/*
* Initializes the thread subsystem, creating various worker threads.
*
/*
* Initializes the thread subsystem, creating various worker threads.
*