Changeset 530

Timestamp:

05/02/07 22:01:34 (2 years ago)

Author:

bradfitz

Message:

merging client-xs-20070328 branch into trunk

Files:

• trunk/api/xs/Cache-Memcached-GetParserXS (modified) (1 prop)
• trunk/api/xs/Cache-Memcached-GetParserXS/GetParserXS.xs (modified) (15 diffs)
• trunk/api/xs/Cache-Memcached-GetParserXS/Makefile.PL (modified) (2 diffs)
• trunk/api/xs/Cache-Memcached-GetParserXS/const-c.inc (deleted)
• trunk/api/xs/Cache-Memcached-GetParserXS/const-xs.inc (deleted)
• trunk/api/xs/Cache-Memcached-GetParserXS/lib/Cache/Memcached/GetParserXS.pm (modified) (2 diffs)
• trunk/api/xs/Cache-Memcached-GetParserXS/t/Cache-Memcached-GetParserXS.t (modified) (1 diff)

trunk/api/xs/Cache-Memcached-GetParserXS/GetParserXS.xs

@@ -4 +4 @@
-
-#include "ppport.h"
-
-#include "const-c.inc"
-
-#define DEST     0  /* destination hashref we're writing into */
@@ -15 +13 @@
-#define FLAGS    6
-#define KEY      7  /* current key we're parsing (without the namespace prefix) */
+#define FINISHED 8  /* hashref of keys and flags to be finalized at any time */
-
-#define DEBUG    0
+
+#include "const-c.inc"
-
-int get_nslen (AV* self) {
@@ -25 +26 @@
-}
-
-void set_key (AV* self, const char *key
-strlen(key)
-
-
-
+inline void set_key (AV* self, const char *key, int len
+len
+
+
+inline 
-  SV** svp = av_fetch(self, KEY, 0);
-  if (svp)
@@ -36 +37 @@
-}
-
-
+inline 
-  SV** svp = av_fetch(self, ON_ITEM, 0);
-  if (svp)
@@ -43 +44 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  av_store(self, FLAGS, newSViv(flags));
-}
-
-
+inline 
-  av_store(self, OFFSET, newSViv(offset));
-}
-
-
+inline 
-  av_store(self, STATE, newSViv(state));
-}
-
-
+inline 
-  SV** svp = av_fetch(self, DEST, 0);
-  if (svp)
@@ -62 +77 @@
-}
-
-
+
+
+
+
+
+
+
+
-  SV** svp = av_fetch(self, STATE, 0);
-  if (svp)
@@ -69 +91 @@
-}
-
-
+inline 
-  SV** svp = av_fetch(self, BUF, 0);
-  if (svp)
@@ -78 +100 @@
-/* returns an answer, but also unsets ON_ITEM */
-int final_answer (AV* self, int ans) {
-
+//
-  return ans;
-}
@@ -88 +110 @@
-  STRLEN len;
-  char* buf;
-  char key[257];
-  unsigned int itemlen;
-  unsigned int flags;
@@ -94 +115 @@
-  int nslen = get_nslen(self);
-  SV* on_item = get_on_item(self);
+  register signed char c;
+  char *key;
+  register char *p;
+  int key_len, barelen;
+  int state, copy, new_p;
+  char *barekey;
+
+  HV* finished = get_finished(self);
-
-  if (DEBUG)
@@ -101 +130 @@
-    int rv;
-    buf = SvPV(bufsv, len);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        printf("key=[%s], state=%d, copy=%d\n", key, state, copy);
+      }
-
-      if (copy) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-      }
-
-      /* delete the stuff we used */
-
+new_
-
-      if (copy == state) {
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        set_offset(self, 0);
@@ -156 +221 @@
-      } else {
-        /* don't have it all... but buffer is now empty */
+        hv_store(finished, barekey, barelen, newSViv(flags), 0);
-        set_offset(self, copy);
-        set_flags(self, flags);
-
+, barelen
-        set_state(self, state);
-
@@ -168 +234 @@
-    }
-
-
-
-
+
+
+
+
+
+
-    }
+    // Just fall through if after 'E' was not "ND\r\n"
+
+    else
+      ;         // Unknown command: not 'E' or 'V' at [0]
-
-
@@ -183 +256 @@
-    */
-
+  recover_from_partial_line:
-    set_offset(self, len);
-    return 0;
@@ -188 +262 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-INCLUDE: const-xs.inc
-
-int
-parse_from_sock_xx ( self, sock, sockfd )
-    SV *self
-    SV *sock
-    int sockfd
-
-int

trunk/api/xs/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,
@@ -22 +24 @@
-  # files to replace their "fallback" counterparts before distributing your
-  # changes.
-
+DEST NSLEN ON_ITEM BUF STATE OFFSET FLAGS KEY FINISHED
-  ExtUtils::Constant::WriteConstants(
-                                     NAME         => 'Cache::Memcached::GetParserXS',

trunk/api/xs/Cache-Memcached-GetParserXS/lib/Cache/Memcached/GetParserXS.pm

@@ -4 +4 @@
-use strict;
-use warnings;
+# We don't want to inherit from this, because our constants may be different.
+# use base 'Cache::Memcached::GetParser';
-use Carp;
-
-
+
-use AutoLoader;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-our $VERSION = '0.01';
+
+require XSLoader;
+XSLoader::load('Cache::Memcached::GetParserXS', $VERSION);
+
+sub DEST;
+sub NSLEN;
+sub ON_ITEM;
+sub BUF;
+sub STATE;
+sub OFFSET;
+sub FLAGS;
+sub KEY;
+sub FINISHED;
+
+sub new {
+    my ($class, $dest, $nslen, $on_item) = @_;
+
+    my $self = bless [], (ref $class || $class);
+
+    $self->[DEST]     = $dest;
+    $self->[NSLEN]    = $nslen;
+    $self->[ON_ITEM]  = $on_item;
+    $self->[BUF]      = '';
+    $self->[STATE]    = 0;
+    $self->[OFFSET]   = 0;
+    $self->[FLAGS]    = undef;
+    $self->[KEY]      = undef;
+    $self->[FINISHED] = {};
+
+    return $self
+}
+
+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;
+}
+
+# returns 1 on success, -1 on failure, and 0 if still working.
+sub parse_from_sock {
+    my ($self, $sock) = @_;
+    my $res;
+
+    # where are we reading into?
+    if ($self->[STATE]) { # reading value into $ret
+        my $ret = $self->[DEST];
+        $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->[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],
+                   128*1024, $self->[OFFSET]);
+    return 0
+        if !defined($res) and $!==EWOULDBLOCK;
+    if ($res == 0) {
+        $self->[ON_ITEM] = undef;
+        return -1;
+    }
+
+    $self->[OFFSET] += $res;
+
+    my $answer = $self->parse_buffer;
+
+    if ($answer > 0) {
+        $self->[ON_ITEM]->($self->[FINISHED]);
+        $self->[ON_ITEM] = undef;
+    }
+
+    return $answer;
+}
+
+sub DESTROY {} # Empty definition, so AUTOLOAD doesn't catch it
+
+# sub parse_buffer is defined in XS
-
-sub AUTOLOAD {
@@ -52 +142 @@
-    goto &$AUTOLOAD;
-}
-
-require XSLoader;
-XSLoader::load('Cache::Memcached::GetParserXS', $VERSION);
-
-# Preloaded methods go here.
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-1;

trunk/api/xs/Cache-Memcached-GetParserXS/t/Cache-Memcached-GetParserXS.t

@@ -1 @@
-
-
+
-
-
+
+
+
-
-
+
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Insert your test code below, the Test::More module is use()ed here so read
-# its man page ( perldoc Test::More ) for help writing this test script.
-
+sub new_parser {
+    $fin = undef;
+    Cache::Memcached::GetParserXS->new({}, 0, sub { $fin = $_[0] });
+}