Changeset e61b4e

Timestamp:

10/05/08 13:49:56 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

b1ae26

Parents:

c346b2

git-author:

Tomash Brechko <tomash.brechko@…> (10/04/08 16:24:39)

git-committer:

Tomash Brechko <tomash.brechko@…> (10/05/08 13:49:56)

Message:

Simplify the code.

File:

• src/client.c (modified) (3 diffs)

src/client.c

@@ -1406 +1406 @@
       struct server *s;
       struct pollfd *pollfd_beg, *pollfd;
-      int nfds, res;
-
-      nfds = 0;
+      int res;
+
+      pollfd_beg = array_beg(c->pollfds, struct pollfd);
+      pollfd = pollfd_beg;
+
       for (array_each(c->servers, struct server, s))
         {
@@ -1435 +1437 @@
           if (may_read || may_write)
             {
-#if 1
-              /*
-                At least gcc 3.4.2--4.2.2 report that res may be used
-                uninitialized here.  Though this doesn't look so, we
-                initialize it to suppress the warning.
-              */
-              int res = 0;
-#endif
-
               if (may_write)
                 {
+                  int res;
+
                   res = send_request(state, s);
                   if (res == MEMCACHED_CLOSED)
@@ -1452 +1447 @@
 
               if (may_read)
-                res = process_reply(state, s);
-
-              if (is_active(state))
-                ++nfds;
+                process_reply(state, s);
+
+              if (! is_active(state))
+                continue;
             }
-          else
+
+          pollfd->events = 0;
+
+          if (state->iov_count > 0)
+            pollfd->events |= POLLOUT;
+          if (state->reply_count > 0 || state->nowait_count > 0)
+            pollfd->events |= POLLIN;
+
+          if (pollfd->events != 0)
             {
-              ++nfds;
+              pollfd->fd = state->fd;
+              state->pollfd = pollfd;
+              ++pollfd;
             }
         }
 
-      if (nfds == 0)
+      if (pollfd == pollfd_beg)
         break;
-
-      pollfd_beg = array_beg(c->pollfds, struct pollfd);
-      pollfd = pollfd_beg;
-
-      for (array_each(c->servers, struct server, s))
-        {
-          struct command_state *state = &s->cmd_state;
-
-          if (is_active(state))
-            {
-              pollfd->events = 0;
-
-              if (state->iov_count > 0)
-                pollfd->events |= POLLOUT;
-              if (state->reply_count > 0 || state->nowait_count > 0)
-                pollfd->events |= POLLIN;
-
-              if (pollfd->events != 0)
-                {
-                  pollfd->fd = state->fd;
-                  state->pollfd = pollfd;
-                  ++pollfd;
-                }
-            }
-        }
 
       do