projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
5f8c67f
)
Wrapping up fixed for .24 release
author
Brian Aker
<brian@tangent.org>
Tue, 16 Sep 2008 09:59:20 +0000
(
02:59
-0700)
committer
Brian Aker
<brian@tangent.org>
Tue, 16 Sep 2008 09:59:20 +0000
(
02:59
-0700)
ChangeLog
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
libmemcached/memcached.h
patch
|
blob
|
history
libmemcached/memcached_connect.c
patch
|
blob
|
history
libmemcached/memcached_hosts.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 3abd6452ee8eaad668ca02c4cb00f17425158a00..16e53cb1d593b868a14a01ce2bc9dccc8899306e 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,4
@@
+0.24 Tue Sep 16 02:59:03 PDT 2008
* Cleanup compile warnings.
* Fix issues in partitioning by keys.
* Fixed "fail case" to make sure when calling memcached_clone() no
* Cleanup compile warnings.
* Fix issues in partitioning by keys.
* Fixed "fail case" to make sure when calling memcached_clone() no
diff --git
a/configure.ac
b/configure.ac
index 33968234713e0a46ff656bacf425461ac2cc1cbc..643273b995b4fa20648ab6257fbdafb9117a186d 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-7,7
+7,7
@@
MEMCACHED_LIBRARY_NAME=libmemcached
#release versioning
MEMCACHED_MAJOR_VERSION=0
#release versioning
MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=2
3
+MEMCACHED_MINOR_VERSION=2
4
MEMCACHED_MICRO_VERSION=0
#API version
MEMCACHED_MICRO_VERSION=0
#API version
@@
-59,7
+59,8
@@
sinclude(config/protocol_binary.m4)
CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
if test "$GCC" = "yes"
then
CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
if test "$GCC" = "yes"
then
- CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
+ #CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
+ CFLAGS="-Wall -O3 $CFLAGS"
if test "$ENABLE_DEBUG" = "yes"
then
if test "$ENABLE_DEBUG" = "yes"
then
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 3017fbb172d13e68fa925cf6fbb7f0e4824acd1c..f0b0694836c56ae528ca6886d931f0a1f7827a1d 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-37,7
+37,7
@@
struct memcached_continuum_item_st {
uint32_t value;
};
uint32_t value;
};
-#define LIBMEMCACHED_VERSION_STRING "0.2
3
"
+#define LIBMEMCACHED_VERSION_STRING "0.2
4
"
struct memcached_stat_st {
uint32_t pid;
struct memcached_stat_st {
uint32_t pid;
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 54316c59f90e677eae6752a7bedc45b318adfca0..2b392fb6138528361abb5836f9e3d628fcface76 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-1,4
+1,5
@@
#include "common.h"
#include "common.h"
+#include <netdb.h>
#include <poll.h>
#include <sys/time.h>
#include <poll.h>
#include <sys/time.h>
@@
-248,13
+249,13
@@
test_connect:
ptr->address_info= NULL;
}
ptr->address_info= NULL;
}
- if (ptr->root->retry_timeout)
- {
- struct timeval next_time;
+
if (ptr->root->retry_timeout)
+
{
+
struct timeval next_time;
- gettimeofday(&next_time, NULL);
- ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
- }
+
gettimeofday(&next_time, NULL);
+
ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+
}
ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO;
}
ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO;
}
diff --git
a/libmemcached/memcached_hosts.c
b/libmemcached/memcached_hosts.c
index 13604d33b95ceb95f50b259c62f627d4551c0d82..3082f693836c37eda7a86c17f971461ebe2dbb28 100644
(file)
--- a/
libmemcached/memcached_hosts.c
+++ b/
libmemcached/memcached_hosts.c
@@
-152,7
+152,11
@@
memcached_return update_continuum(memcached_st *ptr)
float pct = (float)list[host_index].limit_maxbytes/ (float)total_mem_bytes;
pointer_per_server= floorf( pct * MEMCACHED_POINTS_PER_SERVER * (float)(ptr->number_of_hosts));
#ifdef HAVE_DEBUG
float pct = (float)list[host_index].limit_maxbytes/ (float)total_mem_bytes;
pointer_per_server= floorf( pct * MEMCACHED_POINTS_PER_SERVER * (float)(ptr->number_of_hosts));
#ifdef HAVE_DEBUG
- printf("ketama_weighted:%s|%d|%llu|%u\n", list[host_index].hostname, list[host_index].port, list[host_index].limit_maxbytes, pointer_per_server);
+ printf("ketama_weighted:%s|%d|%llu|%u\n",
+ list[host_index].hostname,
+ list[host_index].port,
+ (unsigned long long)list[host_index].limit_maxbytes,
+ pointer_per_server);
#endif
}
for(index= 1; index <= pointer_per_server; ++index)
#endif
}
for(index= 1; index <= pointer_per_server; ++index)