Changeset 5038

Timestamp:

01/20/08 14:23:51 (5 years ago)

Author:

daisuke

Message:

lang/perl/Cache-Memcached-LibMemcached?; call compress/serialize via CVs, not SV(w/pv)

Location:

lang/perl/Cache-Memcached-LibMemcached/trunk

Files:

• LibMemcached.xs (modified) (2 diffs)
• lib/Cache/Memcached/LibMemcached.pm (modified) (2 diffs)
• perl-libmemcached.c (modified) (10 diffs)
• perl-libmemcached.h (modified) (2 diffs)

lang/perl/Cache-Memcached-LibMemcached/trunk/LibMemcached.xs

@@ -15 +15 @@
 
 SV *
-Cache_LibMemcached__XS_new(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings)
+Cache_LibMemcached__XS_new(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings, compress_method, uncompress_method, serialize_method, deserialize_method)
         char *pkg;
         bool have_zlib;
@@ -21 +21 @@
         size_t compress_threshold;
         float compress_savings;
-    CODE:
-        RETVAL = Cache_LibMemcached_create(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings);
+        SV *compress_method;
+        SV *uncompress_method;
+        SV *serialize_method;
+        SV *deserialize_method;
+    CODE:
+        RETVAL = Cache_LibMemcached_create(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings, compress_method, uncompress_method, serialize_method, deserialize_method);
     OUTPUT:
         RETVAL

lang/perl/Cache-Memcached-LibMemcached/trunk/lib/Cache/Memcached/LibMemcached.pm

@@ -8 +8 @@
 use warnings;
 use Carp 'croak';
-use Storable;
+use Storable ();
 use constant HAVE_ZLIB => eval "use Compress::Zlib (); 1;";
 use constant COMPRESS_SAVINGS => 0.20;
@@ -38 +38 @@
         $args->{compress_threshold} || 0,
         COMPRESS_SAVINGS,
-        \&Compress::Zlib::memGzip,
-        \&Compress::Zlib::memGunzip,
+        HAVE_ZLIB ? \&Compress::Zlib::memGzip : undef,
+        HAVE_ZLIB ? \&Compress::Zlib::memGunzip : undef,
         \&Storable::nfreeze,
         \&Storable::thaw,

lang/perl/Cache-Memcached-LibMemcached/trunk/perl-libmemcached.c

@@ -8 +8 @@
 #define __PERL_LIBMEMCACHED_C__
 #include "perl-libmemcached.h"
+
+#define ASSERT_CALLBACK(x) \
+    if (! SvOK(x) || ! SvROK(x) || SvTYPE(SvRV(x) ) != SVt_PVCV) { \
+        croak("provided argument is not a coderef!"); \
+    }
 
 #define CONSTSUBi(name, x) \
@@ -112 +117 @@
         PUTBACK;
 
-        if (call_pv("Compress::Zlib::memGunzip", G_SCALAR) <= 0) {
-            croak("Compress::Zlib::memGunzip did not return a proper value");
+        if (call_sv(MEMCACHED_UNCOMPRESS_METHOD(cache), G_SCALAR) <= 0) {
+            croak("uncompress_method did not return a proper value");
         }
         SPAGAIN;
@@ -142 +147 @@
         PUTBACK;
 
-        if (call_pv("Storable::thaw", G_SCALAR) <= 0) {
-            croak("Storable::thaw did not return a proper value");
+        if (call_sv(MEMCACHED_DESERIALIZE_METHOD(cache), G_SCALAR) <= 0) {
+            croak("deserialize_method did not return a proper value");
         }
         SPAGAIN;
@@ -173 +178 @@
         PUTBACK;
 
-        if (call_pv("Storable::freeze", G_SCALAR) <= 0) {
-            croak("Storable::freeze did not return a proper value");
+        if (call_sv(MEMCACHED_SERIALIZE_METHOD(cache), G_SCALAR) <= 0) {
+            croak("serialize_method did not return a proper value");
         }
         SPAGAIN;
@@ -217 +222 @@
         PUTBACK;
 
-        if (call_pv("Compress::Zlib::memGzip", G_SCALAR) <= 0) {
-            croak("Compress::Zlib::memGzip did not return a proper value");
+        if (call_sv(MEMCACHED_COMPRESS_METHOD(cache), G_SCALAR) <= 0) {
+            croak("compress_method did not return a proper value");
         }
         SPAGAIN;
@@ -311 +316 @@
 
 SV *
-Cache_LibMemcached_create(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings)
+Cache_LibMemcached_create(pkg, have_zlib, compress_enabled, compress_threshold, compress_savings, compress_method, uncompress_method, serialize_method, deserialize_method)
         char *pkg;
         bool have_zlib;
@@ -317 +322 @@
         size_t compress_threshold;
         float compress_savings;
+        SV *compress_method;
+        SV *uncompress_method;
+        SV *serialize_method;
+        SV *deserialize_method;
 {
     SV *sv;
@@ -329 +338 @@
     MEMCACHED_COMPRESS_THRESHOLD(xs) = compress_threshold;
     MEMCACHED_COMPRESS_SAVINGS(xs)   = compress_savings;
+    MEMCACHED_COMPRESS_METHOD(xs)    = compress_method;
+    MEMCACHED_UNCOMPRESS_METHOD(xs)  = uncompress_method;
+    MEMCACHED_SERIALIZE_METHOD(xs)   = serialize_method;
+    MEMCACHED_DESERIALIZE_METHOD(xs) = deserialize_method;
+
+    SvREFCNT_inc(compress_method);
+    SvREFCNT_inc(uncompress_method);
+    SvREFCNT_inc(serialize_method);
+    SvREFCNT_inc(deserialize_method);
+    ASSERT_CALLBACK( MEMCACHED_SERIALIZE_METHOD(xs) );
 
     XS_STRUCT2OBJ(sv, "Cache::Memcached::LibMemcached", xs);
@@ -341 +360 @@
     memcached_quit(MEMCACHED_CACHE(cache));
     memcached_free(MEMCACHED_CACHE(cache));
+    SvREFCNT_dec(MEMCACHED_COMPRESS_METHOD(cache));
+    SvREFCNT_dec(MEMCACHED_UNCOMPRESS_METHOD(cache));
+    SvREFCNT_dec(MEMCACHED_DESERIALIZE_METHOD(cache));
+    SvREFCNT_dec(MEMCACHED_SERIALIZE_METHOD(cache));
 }
 
@@ -419 +442 @@
 
     hv = newHV();
-    while (1) {
+    for(i = 0; i < keys_len; i++) {
+/*    while (1) {*/
         char *value;
         char key[MEMCACHED_MAX_KEY];

lang/perl/Cache-Memcached-LibMemcached/trunk/perl-libmemcached.h

@@ -35 +35 @@
     size_t        compress_threshold;
     NV            compress_savings;
+    SV           *compress_method;
+    SV           *uncompress_method;
+    SV           *serialize_method;
+    SV           *deserialize_method;
 } Cache_LibMemcached;
 
@@ -42 +46 @@
 #define MEMCACHED_COMPRESS_THRESHOLD(x) x->compress_threshold
 #define MEMCACHED_COMPRESS_SAVINGS(x)   x->compress_savings
+#define MEMCACHED_COMPRESS_METHOD(x)    x->compress_method
+#define MEMCACHED_UNCOMPRESS_METHOD(x)  x->uncompress_method
+#define MEMCACHED_SERIALIZE_METHOD(x)   x->serialize_method
+#define MEMCACHED_DESERIALIZE_METHOD(x) x->deserialize_method
 
 typedef memcached_return Cache_LibMemcached_rc;
 typedef memcached_stat_st Cache_LibMemcached_stat;
 
-SV *Cache_LibMemcached_create(
-        char *pkg,
-        bool have_zlib,
-        bool compress_enabled,
-        size_t compress_threshold,
-        float compress_savings
+SV *
+Cache_LibMemcached_create(
+    char *pkg,
+    bool have_zlib,
+    bool compress_enabled,
+    size_t compress_threshold,
+    float compress_savings,
+    SV *compress_method,
+    SV *decompress_method,
+    SV *serialize_method,
+    SV *deserialize_method
 );