Changeset 672

Timestamp:

12/11/07 03:28:34 (1 year ago)

Author:

dormando

Message:

protocol-flag patch from Dustin Sallings

Files:

• branches/binary/server/memcached.c (modified) (18 diffs)
• branches/binary/server/memcached.h (modified) (4 diffs)
• branches/binary/server/thread.c (modified) (4 diffs)

branches/binary/server/memcached.c

@@ -64 +64 @@
- */
-static void drive_machine(conn *c);
-bool is_udp
-bool is_udp
+int prot
+int prot
-static int try_read_command(conn *c);
-static int try_read_network(conn *c);
@@ -229 +229 @@
-    c->msgused++;
-
-c->udp
+IS_UDP(c->protocol)
-        /* Leave room for the UDP header, which we'll fill in later. */
-        return add_iov(c, NULL, UDP_HEADER_SIZE);
@@ -294 +294 @@
-
-conn *conn_new(const int sfd, const int init_state, const int event_flags,
-bool is_udp
+int prot
-    conn *c = conn_from_freelist();
-
@@ -345 +345 @@
-        if (init_state == conn_listening)
-            fprintf(stderr, "<%d server listening\n", sfd);
-is_udp
+IS_UDP(prot)
-            fprintf(stderr, "<%d server listening (udp)\n", sfd);
-        else
@@ -352 +352 @@
-
-    c->sfd = sfd;
-udp = is_udp
+protocol = prot
-    c->state = init_state;
-    c->rlbytes = 0;
@@ -480 +480 @@
-    assert(c != NULL);
-
-c->udp
+IS_UDP(c->protocol)
-        return;
-
@@ -652 +652 @@
-         * UDP_MAX_PAYLOAD_SIZE bytes.
-         */
-c->udp
+IS_UDP(c->protocol)
-
-        /* We may need to start a new msghdr if this one is full. */
@@ -1319 +1319 @@
-    */
-    if (key_token->value != NULL || add_iov(c, "END\r\n", 5) != 0
-c->udp
+IS_UDP(c->protocol)
-        out_string(c, "SERVER_ERROR out of memory");
-    }
@@ -2033 +2033 @@
-            perror("Failed to write, and not due to blocking");
-
-c->udp
+IS_UDP(c->protocol)
-            conn_set_state(c, conn_read);
-        else
@@ -2079 +2079 @@
-            }
-            dispatch_conn_new(sfd, conn_read, EV_READ | EV_PERSIST,
-false
+ascii_prot
-            break;
-
@@ -2086 +2086 @@
-                continue;
-            }
-c->udp
+IS_UDP(c->protocol)
-                continue;
-            }
@@ -2197 +2197 @@
-             * list for TCP or a two-entry list for UDP).
-             */
-c->udp
+IS_UDP(c->protocol)
-                if (add_iov(c, c->wcurr, c->wbytes) != 0 ||
-c->udp
+IS_UDP(c->protocol)
-                    if (settings.verbose > 0)
-                        fprintf(stderr, "Couldn't build response\n");
@@ -2254 +2254 @@
-
-        case conn_closing:
-c->udp
+IS_UDP(c->protocol)
-                conn_cleanup(c);
-            else
@@ -2288 +2288 @@
-}
-
-bool is_udp
+int prot
-    int sfd;
-    int flags;
-
-is_udp
+IS_UDP(prot)
-        perror("socket()");
-        return -1;
@@ -2342 +2342 @@
-
-
-bool is_udp
+int prot
-    int sfd;
-    struct linger ling = {0, 0};
@@ -2348 +2348 @@
-    int flags =1;
-
-is_udp
+prot
-        return -1;
-    }
-
-    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
-is_udp
+IS_UDP(prot)
-        maximize_sndbuf(sfd);
-    } else {
@@ -2375 +2375 @@
-        return -1;
-    }
-is_udp
+IS_UDP(prot)
-        perror("listen()");
-        close(sfd);
@@ -2967 +2967 @@
-            /* this is guaranteed to hit all threads because we round-robin */
-            dispatch_conn_new(u_socket, conn_read, EV_READ | EV_PERSIST,
-1
+ascii_udp_prot
-        }
-    }

branches/binary/server/memcached.h

@@ -143 +143 @@
-};
-
+enum protocols {
+    ascii_prot = 3, /* arbitrary value. */
+    ascii_udp_prot
+};
+
+#define IS_UDP(x) (x == ascii_udp_prot)
+
-#define NREAD_ADD 1
-#define NREAD_SET 2
@@ -207 +214 @@
-    int    suffixleft;
-
+    int protocol;   /* which protocol this connection speaks */
+
-    /* data for UDP clients */
-    bool   udp;       /* is this is a UDP "connection" */
-    int    request_id; /* Incoming UDP request ID, if this is a UDP "connection" */
-    struct sockaddr request_addr; /* Who sent the most recent request */
@@ -243 +251 @@
-char *do_add_delta(item *item, const bool incr, const int64_t delta, char *buf);
-int do_store_item(item *item, int comm);
-bool is_udp
+int prot
-
-
@@ -269 +277 @@
-void thread_init(int nthreads, struct event_base *main_base);
-int  dispatch_event_add(int thread, conn *c);
-is_udp
+prot
-
-/* Lock wrappers for cache functions that are called from main loop. */

branches/binary/server/thread.c

@@ -32 +32 @@
-    int     event_flags;
-    int     read_buffer_size;
-is_udp
+protocol
-    CQ_ITEM *next;
-};
@@ -343 +343 @@
-    if (NULL != item) {
-        conn *c = conn_new(item->sfd, item->init_state, item->event_flags,
-is_udp
+protocol
-        if (c == NULL) {
-item->is_udp
+IS_UDP(item->protocol)
-                fprintf(stderr, "Can't listen for events on UDP socket\n");
-                exit(1);
@@ -369 +369 @@
- */
-void dispatch_conn_new(int sfd, int init_state, int event_flags,
-is_udp
+prot
-    CQ_ITEM *item = cqi_new();
-    int thread = (last_thread + 1) % settings.num_threads;
@@ -379 +379 @@
-    item->event_flags = event_flags;
-    item->read_buffer_size = read_buffer_size;
-is_udp = is_udp
+protocol = prot
-
-    cq_push(&threads[thread].new_conn_queue, item);