Changeset 529

Timestamp:

05/02/07 21:57:25 (2 years ago)

Author:

bradfitz

Message:

cleanup, cleanup, cleanup, cleanup.

and some tests.

and use the new interface in Cache::Memcached 1.21 to do less closure
calls, and pass in instead a whole map of {$key => $flags, ...} to
finalize subref.

Files:

• branches/client-xs-20070328/Cache-Memcached-GetParserXS (modified) (1 prop)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/GetParserXS.xs (modified) (1 diff)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/Makefile.PL (modified) (1 diff)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/const-c.inc (deleted)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/const-xs.inc (deleted)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/lib/Cache/Memcached/GetParserXS.pm (modified) (3 diffs)
• branches/client-xs-20070328/Cache-Memcached-GetParserXS/t/Cache-Memcached-GetParserXS.t (modified) (1 diff)

branches/client-xs-20070328/Cache-Memcached-GetParserXS/GetParserXS.xs

@@ -262 +262 @@
-}
-
-int parse_from_sock_xx (SV* selfref, SV* sock, int sockfd) {
-  int res;
-  AV* self = (AV*) SvRV(selfref);
-  HV* ret = get_dest(self);
-  IV state = get_state(self);
-
-  if (state) {
-    // We're reading into a key, get the SV for the key
-    SV* key = get_key_sv(self);
-    SV* offset = get_offset_sv(self);
-    STRLEN keylen;
-    char *keyptr = SvPV(key, keylen);
-
-    STRLEN buflen;
-    char* buf;
-
-    // Then we try to get the value
-    SV** valptr = hv_fetch(ret, keyptr, keylen, 0);
-    if (valptr) {
-      // Got a real value, must be an SV
-      buf = SvPV(*valptr, buflen);
-    } else {
-      // If we get null back, it's because the entry didn't exist, vivify it.
-      New(0, buf, state, char);
-      *valptr = newSVpvn(buf, state);
-    }
-
-    if (buflen < SvIV(offset) + state) {
-      // Buffer is too short, Renew it to the proper length
-      Renew(buf, SvIV(offset) + state, char);
-    }
-
-    // Finally, read the data into the buffer
-    res = read(sockfd, (buf + SvIV(offset)), (state - SvIV(offset)));
-
-    if (res < 0 && errno == EWOULDBLOCK)
-      return 0;
-
-    if (res == 0) {
-      clear_on_item(self);
-      return -1;
-    }
-
-    sv_setiv(offset, (SvIV(offset) + res));
-
-    if (SvIV(offset) == state) {
-      
-    }
-  }
-
-  printf("fileno = %d\n", sockfd);
-
-  printf("got = %x, state = %d\n", ret, state);
-  return -1;
-}
-
-  /*
-    # where are we reading into?
-    if ($self->[STATE]) { # reading value into $ret
-        $res = sysread($sock, $ret->{$self->[KEY]},
-                       $self->[STATE] - $self->[OFFSET],
-                       $self->[OFFSET]);
-
-        return 0
-            if !defined($res) and $!==EWOULDBLOCK;
-
-        if ($res == 0) { # catches 0=conn closed or undef=error
-            $self->[ON_ITEM] = undef;
-            return -1;
-        }
-
-        $self->[OFFSET] += $res;
-        if ($self->[OFFSET] == $self->[STATE]) { # finished reading
-            $self->[ON_ITEM]->($self->[KEY], $self->[FLAGS]);
-            $self->[OFFSET] = 0;
-            $self->[STATE]  = 0;
-            # wait for another VALUE line or END...
-        }
-        return 0; # still working, haven't got to end yet
-    }
-
-    # we're reading a single line.
-    # first, read whatever's there, but be satisfied with 2048 bytes
-    $res = sysread($sock, $self->[BUF],
-                   2048, $self->[OFFSET]);
-    return 0
-        if !defined($res) and $!==EWOULDBLOCK;
-    if ($res == 0) {
-        $self->[ON_ITEM] = undef;
-        return -1;
-    }
-
-    $self->[OFFSET] += $res;
-
-  */
-
-MODULE = Cache::Memcached::GetParserXS      PACKAGE = Cache::Memcached::GetParserXS
-
-INCLUDE: const-xs.inc
-
-int
-parse_from_sock_xx ( self, sock, sockfd )
-    SV *self
-    SV *sock
-    int sockfd
-
-int

branches/client-xs-20070328/Cache-Memcached-GetParserXS/Makefile.PL

@@ -5 +5 @@
-WriteMakefile(
-              OPTIMIZE => '-g',
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-if  (eval {require ExtUtils::Constant; 1}) {
-  # If you edit these definitions to change the constants used by this module,

branches/client-xs-20070328/Cache-Memcached-GetParserXS/lib/Cache/Memcached/GetParserXS.pm

@@ -9 +9 @@
-use Errno qw( EINPROGRESS EWOULDBLOCK EISCONN );
-use AutoLoader;
+use Cache::Memcached 1.21;
-
-our $VERSION = '0.01';
@@ -45 +46 @@
-sub current_key {
-    return $_[0][KEY];
+}
+
+sub t_parse_buf {
+    my ($self, $buf) = @_;
+    # force buf into \r\n format
+    $buf =~ s/\n/\r\n/g;
+    $buf =~ s/\r\r/\r/g;
+
+    $self->[BUF] .= $buf;
+    $self->[OFFSET] += length $buf;
+    my $rv = $self->parse_buffer;
+    if ($rv > 0) {
+        $self->[ON_ITEM]->($self->[FINISHED]);
+        $self->[ON_ITEM] = undef;
+    }
+    return $rv;
-}
-
@@ -92 +109 @@
-
-    if ($answer > 0) {
-
-
-
-
-
-
+
-        $self->[ON_ITEM] = undef;
-    }

branches/client-xs-20070328/Cache-Memcached-GetParserXS/t/Cache-Memcached-GetParserXS.t

@@ -1 @@
-
+
+
+
-BEGIN { use_ok('Cache::Memcached::GetParserXS') };
+use Data::Dumper;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+