Use string2ll in ziplist code (faster)

[redis.git] / src / networking.c

diff --git a/src/networking.c b/src/networking.c
index 29eed88866fb11d26094021cd3a01bb7ad0dd697..48febb09ce26a89080cadde4ce584f8ae2610933 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -700,46 +700,49 @@ static void setProtocolError(redisClient *c, int pos) {
 
 int processMultibulkBuffer(redisClient *c) {
     char *newline = NULL;
 
 int processMultibulkBuffer(redisClient *c) {
     char *newline = NULL;

-    char *eptr;
-    int pos = 0, tolerr;
-    long bulklen;
+    int pos = 0, ok;
+    long long ll;

 
     if (c->multibulklen == 0) {
         /* The client should have been reset */
         redisAssert(c->argc == 0);
 
         /* Multi bulk length cannot be read without a \r\n */
 
     if (c->multibulklen == 0) {
         /* The client should have been reset */
         redisAssert(c->argc == 0);
 
         /* Multi bulk length cannot be read without a \r\n */

-        newline = strstr(c->querybuf,"\r\n");
+        newline = strchr(c->querybuf,'\r');

         if (newline == NULL)
             return REDIS_ERR;
 
         /* We know for sure there is a whole line since newline != NULL,
          * so go ahead and find out the multi bulk length. */
         redisAssert(c->querybuf[0] == '*');
         if (newline == NULL)
             return REDIS_ERR;
 
         /* We know for sure there is a whole line since newline != NULL,
          * so go ahead and find out the multi bulk length. */
         redisAssert(c->querybuf[0] == '*');

-        c->multibulklen = strtol(c->querybuf+1,&eptr,10);
-        pos = (newline-c->querybuf)+2;
-        if (c->multibulklen <= 0) {
-            c->querybuf = sdsrange(c->querybuf,pos,-1);
-            return REDIS_OK;
-        } else if (c->multibulklen > 1024*1024) {
+        ok = string2ll(c->querybuf+1,newline-(c->querybuf+1),&ll);
+        if (!ok || ll > 1024*1024) {

             addReplyError(c,"Protocol error: invalid multibulk length");
             setProtocolError(c,pos);
             return REDIS_ERR;
         }
 
             addReplyError(c,"Protocol error: invalid multibulk length");
             setProtocolError(c,pos);
             return REDIS_ERR;
         }
 

+        pos = (newline-c->querybuf)+2;
+        if (ll <= 0) {
+            c->querybuf = sdsrange(c->querybuf,pos,-1);
+            return REDIS_OK;
+        }
+
+        c->multibulklen = ll;
+

         /* Setup argv array on client structure */
         if (c->argv) zfree(c->argv);
         c->argv = zmalloc(sizeof(robj*)*c->multibulklen);
 
         /* Search new newline */
         /* Setup argv array on client structure */
         if (c->argv) zfree(c->argv);
         c->argv = zmalloc(sizeof(robj*)*c->multibulklen);
 
         /* Search new newline */

-        newline = strstr(c->querybuf+pos,"\r\n");
+        newline = strchr(c->querybuf+pos,'\r');

     }
 
     redisAssert(c->multibulklen > 0);
     while(c->multibulklen) {
         /* Read bulk length if unknown */
         if (c->bulklen == -1) {
     }
 
     redisAssert(c->multibulklen > 0);
     while(c->multibulklen) {
         /* Read bulk length if unknown */
         if (c->bulklen == -1) {

-            newline = strstr(c->querybuf+pos,"\r\n");
+            newline = strchr(c->querybuf+pos,'\r');

             if (newline != NULL) {
                 if (c->querybuf[pos] != '$') {
                     addReplyErrorFormat(c,
             if (newline != NULL) {
                 if (c->querybuf[pos] != '$') {
                     addReplyErrorFormat(c,


@@ -749,17 +752,14 @@ int processMultibulkBuffer(redisClient *c) {
                     return REDIS_ERR;
                 }
 
                     return REDIS_ERR;
                 }
 

-                bulklen = strtol(c->querybuf+pos+1,&eptr,10);
-                tolerr = (eptr[0] != '\r');
-                if (tolerr || bulklen == LONG_MIN || bulklen == LONG_MAX ||
-                    bulklen < 0 || bulklen > 512*1024*1024)
-                {
+                ok = string2ll(c->querybuf+pos+1,newline-(c->querybuf+pos+1),&ll);
+                if (!ok || ll < 0 || ll > 512*1024*1024) {

                     addReplyError(c,"Protocol error: invalid bulk length");
                     setProtocolError(c,pos);
                     return REDIS_ERR;
                 }
                     addReplyError(c,"Protocol error: invalid bulk length");
                     setProtocolError(c,pos);
                     return REDIS_ERR;
                 }

-                pos += eptr-(c->querybuf+pos)+2;
-                c->bulklen = bulklen;
+                pos += newline-(c->querybuf+pos)+2;
+                c->bulklen = ll;

             } else {
                 /* No newline in current buffer, so wait for more data */
                 break;
             } else {
                 /* No newline in current buffer, so wait for more data */
                 break;