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:
b5f7308
)
Fix for sorting when no servers have been added.
author
Brian Aker
<brian@tangent.org>
Mon, 7 Apr 2008 18:22:00 +0000
(11:22 -0700)
committer
Brian Aker
<brian@tangent.org>
Mon, 7 Apr 2008 18:22:00 +0000
(11:22 -0700)
libmemcached/memcached_hosts.c
patch
|
blob
|
history
diff --git
a/libmemcached/memcached_hosts.c
b/libmemcached/memcached_hosts.c
index 863e7674b7993a6a9dd2a5af13d6791e5014d690..76fd5a014430ef5cd84291746dfab33d10e75bd9 100644
(file)
--- a/
libmemcached/memcached_hosts.c
+++ b/
libmemcached/memcached_hosts.c
@@
-51,8
+51,11
@@
static int compare_servers(const void *p1, const void *p2)
void sort_hosts(memcached_st *ptr)
{
void sort_hosts(memcached_st *ptr)
{
- qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
- ptr->hosts[0].count= ptr->number_of_hosts;
+ if (ptr->number_of_hosts)
+ {
+ qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
+ ptr->hosts[0].count= ptr->number_of_hosts;
+ }
}
static void host_reset(memcached_st *ptr, memcached_server_st *host,
}
static void host_reset(memcached_st *ptr, memcached_server_st *host,
@@
-122,7
+125,7
@@
memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l
}
ptr->hosts[0].count= ptr->number_of_hosts;
}
ptr->hosts[0].count= ptr->number_of_hosts;
- if (ptr->
number_of_hosts > 1 && ptr->
flags & MEM_USE_SORT_HOSTS)
+ if (ptr->flags & MEM_USE_SORT_HOSTS)
sort_hosts(ptr);
rebalance_wheel(ptr);
sort_hosts(ptr);
rebalance_wheel(ptr);
@@
-186,7
+189,7
@@
static memcached_return server_add(memcached_st *ptr, char *hostname,
host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, type);
ptr->number_of_hosts++;
host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, type);
ptr->number_of_hosts++;
- if (ptr->
number_of_hosts > 1 && ptr->
flags & MEM_USE_SORT_HOSTS)
+ if (ptr->flags & MEM_USE_SORT_HOSTS)
sort_hosts(ptr);
ptr->hosts[0].count= ptr->number_of_hosts;
sort_hosts(ptr);
ptr->hosts[0].count= ptr->number_of_hosts;