# HG changeset patch # User Ruslan Ermilov # Date 1364218890 0 # Node ID 0811376954e479b4261dcb86eabe80ab9eef101f # Parent c788e54090de198cb4858ee4aab0a0b69456c310 Upstream: removed sorting of upstream servers. Sorting of upstream servers by their weights is not required by current balancing algorithms. This will likely change mapping to backends served by ip_hash weighted upstreams. diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -10,8 +10,6 @@ #include -static ngx_int_t ngx_http_upstream_cmp_servers(const void *one, - const void *two); static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer( ngx_http_upstream_rr_peer_data_t *rrp); @@ -93,10 +91,6 @@ ngx_http_upstream_init_round_robin(ngx_c us->peer.data = peers; - ngx_sort(&peers->peer[0], (size_t) n, - sizeof(ngx_http_upstream_rr_peer_t), - ngx_http_upstream_cmp_servers); - /* backup servers */ n = 0; @@ -151,10 +145,6 @@ ngx_http_upstream_init_round_robin(ngx_c peers->next = backup; - ngx_sort(&backup->peer[0], (size_t) n, - sizeof(ngx_http_upstream_rr_peer_t), - ngx_http_upstream_cmp_servers); - return NGX_OK; } @@ -216,18 +206,6 @@ ngx_http_upstream_init_round_robin(ngx_c } -static ngx_int_t -ngx_http_upstream_cmp_servers(const void *one, const void *two) -{ - ngx_http_upstream_rr_peer_t *first, *second; - - first = (ngx_http_upstream_rr_peer_t *) one; - second = (ngx_http_upstream_rr_peer_t *) two; - - return (first->weight < second->weight); -} - - ngx_int_t ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r, ngx_http_upstream_srv_conf_t *us)