Changeset 12bc79

Timestamp:

01/17/09 18:29:00 (3 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, master-v0.6, memcached_hash, upstream_count_limit

Children:

2e1f23

Parents:

38354f

git-author:

Tomash Brechko <tomash.brechko@…> (01/17/09 15:52:47)

git-committer:

Tomash Brechko <tomash.brechko@…> (01/17/09 18:29:00)

Message:

Transpose functions to get rid of forward declaration.

File:

• memcached_hash/ngx_http_upstream_memcached_hash_module.c (modified) (2 diffs)

memcached_hash/ngx_http_upstream_memcached_hash_module.c

@@ -94 +94 @@
 
   return (left - memd->buckets);
-}
-
-
-static
-unsigned int
-memcached_hash_find_peer(struct memcached_hash_find_ctx *find_ctx);
-
-
-static
-ngx_int_t
-memcached_hash_get_peer(ngx_peer_connection_t *pc, void *data)
-{
-  struct memcached_hash_find_ctx *find_ctx = data;
-  struct memcached_hash_peer *peer = find_ctx->peer;
-  ngx_peer_addr_t *addr;
-
-  if (! peer)
-    {
-      unsigned int index;
-
-      index = memcached_hash_find_peer(find_ctx);
-
-      peer = find_ctx->peer;
-      pc->tries = find_ctx->server[index].naddrs;
-    }
-
-  if (peer->server->down)
-    goto fail;
-
-  if (peer->server->max_fails > 0 && peer->fails >= peer->server->max_fails)
-    {
-      time_t now = ngx_time();
-      if (now - peer->accessed <= peer->server->fail_timeout)
-        goto fail;
-      else
-        peer->fails = 0;
-    }
-
-  addr = &peer->server->addrs[peer->addr_index];
-
-  pc->sockaddr = addr->sockaddr;
-  pc->socklen = addr->socklen;
-  pc->name = &addr->name;
-
-  return NGX_OK;
-
-fail:
-  /* This is the last try.  */
-  pc->tries = 1;
-
-  return NGX_BUSY;
 }
 
@@ -204 +153 @@
 
   return index;
+}
+
+
+static
+ngx_int_t
+memcached_hash_get_peer(ngx_peer_connection_t *pc, void *data)
+{
+  struct memcached_hash_find_ctx *find_ctx = data;
+  struct memcached_hash_peer *peer = find_ctx->peer;
+  ngx_peer_addr_t *addr;
+
+  if (! peer)
+    {
+      unsigned int index;
+
+      index = memcached_hash_find_peer(find_ctx);
+
+      peer = find_ctx->peer;
+      pc->tries = find_ctx->server[index].naddrs;
+    }
+
+  if (peer->server->down)
+    goto fail;
+
+  if (peer->server->max_fails > 0 && peer->fails >= peer->server->max_fails)
+    {
+      time_t now = ngx_time();
+      if (now - peer->accessed <= peer->server->fail_timeout)
+        goto fail;
+      else
+        peer->fails = 0;
+    }
+
+  addr = &peer->server->addrs[peer->addr_index];
+
+  pc->sockaddr = addr->sockaddr;
+  pc->socklen = addr->socklen;
+  pc->name = &addr->name;
+
+  return NGX_OK;
+
+fail:
+  /* This is the last try.  */
+  pc->tries = 1;
+
+  return NGX_BUSY;
 }