Changeset 38354f for memcached_hash/ngx_http_upstream_memcached_hash_module.c

Timestamp:

01/17/09 18:28:53 (3 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

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

Children:

12bc79

Parents:

9ceabd

git-author:

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

git-committer:

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

Message:

Do not change callback and data pointers after module initialization.

This commit should ease the review. Next one will transpose
functions to eliminate forward declaration.

File:

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

memcached_hash/ngx_http_upstream_memcached_hash_module.c

@@ -1 +1 @@
 /*
-  Copyright (C) 2007-2008 Tomash Brechko.  All rights reserved.
+  Copyright (C) 2007-2009 Tomash Brechko.  All rights reserved.
 
   Development of this module was sponsored by Monashev Co. Ltd.
@@ -55 +55 @@
   ngx_http_upstream_server_t *server;
   ngx_http_request_t *request;
+  struct memcached_hash_peer *peer;
 };
 
@@ -97 +98 @@
 
 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_peer *peer = 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)
@@ -132 +149 @@
 
 static
-ngx_int_t
-memcached_hash_find_peer(ngx_peer_connection_t *pc, void *data)
-{
-  struct memcached_hash_find_ctx *find_ctx = data;
+unsigned int
+memcached_hash_find_peer(struct memcached_hash_find_ctx *find_ctx)
+{
   struct memcached_hash *memd = find_ctx->memd;
   u_char *key;
@@ -185 +201 @@
     }
 
-  pc->data = &memd->peers[index];
-  pc->get = memcached_hash_get_peer;
-  pc->tries = find_ctx->server[index].naddrs;
-
-  return memcached_hash_get_peer(pc, pc->data);
+  find_ctx->peer = &memd->peers[index];
+
+  return index;
 }
 
@@ -198 +212 @@
                          ngx_uint_t state)
 {
-  struct memcached_hash_peer *peer = data;
+  struct memcached_hash_find_ctx *find_ctx = data;
+  struct memcached_hash_peer *peer = find_ctx->peer;
 
   if (state & NGX_PEER_FAILED)
@@ -243 +258 @@
   find_ctx->request = r;
   find_ctx->server = us->servers->elts;
+  find_ctx->peer = NULL;
 
   r->upstream->peer.free = memcached_hash_free_peer;
@@ -250 +266 @@
     memcached_hash_find_peer().
   */
-  r->upstream->peer.get = memcached_hash_find_peer;
+  r->upstream->peer.get = memcached_hash_get_peer;
   r->upstream->peer.data = find_ctx;
   r->upstream->peer.tries = 1;