nginx: src/http/modules/ngx_http_upstream_ip_hash

Upstream: store peers as a linked list. This is an API change.

comparison

equal deleted inserted replaced

-:6ff0ebd6fbf4
+:c44459611d91
 }
 if (!iphp->rrp.peers->weighted) {
 p = hash % iphp->rrp.peers->number;
+peer = iphp->rrp.peers->peer;
+for (i = 0; i < p; i++) {
+peer = peer->next;
+}
 } else {
 w = hash % iphp->rrp.peers->total_weight;
-for (i = 0; i < iphp->rrp.peers->number; i++) {
+for (peer = iphp->rrp.peers->peer, i = 0;
-w -= iphp->rrp.peers->peer[i].weight;
+peer;
+peer = peer->next, i++)
+{
+w -= peer->weight;
 if (w < 0) {
 break;
 }
 }
 goto next;
 }
 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
 "get ip hash peer, hash: %ui %04XA", p, m);
-peer = &iphp->rrp.peers->peer[p];
 /* ngx_lock_mutex(iphp->rrp.peers->mutex); */
 if (peer->down) {
 goto next_try;
 if (++iphp->tries > 20) {
 return iphp->get_rr_peer(pc, &iphp->rrp);
 }
 }
-iphp->rrp.current = p;
+iphp->rrp.current = peer;
 pc->sockaddr = peer->sockaddr;
 pc->socklen = peer->socklen;
 pc->name = &peer->name;

Mercurial > hg > nginx