Changeset 15606

Timestamp:

07/10/08 14:28:25 (5 years ago)

Author:

daisuke

Message:

still broken, but serialization works more or less

Location:

lang/perl/Data-Valve/trunk

Files:

• Valve.xs (modified) (2 diffs)
• dv_bucket.c (modified) (8 diffs)
• dv_bucket.h (modified) (2 diffs)
• lib/Data/Valve/Bucket.pm (modified) (1 diff)
• t/02_bucket.t (modified) (3 diffs)

lang/perl/Data-Valve/trunk/Valve.xs

@@ -8 +8 @@
 
 dv_bucket *
-dv_bucket_create(float interval, unsigned long max)
+dv_bucket_create(double interval, unsigned long max)
 
 void
@@ -24 +24 @@
 dv_bucket_first(dv_bucket *bucket)
 
+long
+dv_bucket_max_items(dv_bucket *bucket)
+
+double 
+dv_bucket_interval(dv_bucket *bucket)
+
+SV *
+dv_bucket_serialize(dv_bucket *bucket)
+
+dv_bucket *
+dv_bucket__deserialize(SV *buf, float interval, long max)
+    PREINIT:
+        STRLEN len;
+        char *c_buf = (char *)SvPV(ST(0), len);
+    CODE:
+        RETVAL = dv_bucket_deserialize(buf, len, interval, max);
+    OUTPUT:
+        RETVAL
+
+
 MODULE = Data::Valve      PACKAGE = Data::Valve::BucketItem PREFIX = dv_bucket_item_
 

lang/perl/Data-Valve/trunk/dv_bucket.c

@@ -3 +3 @@
 
 #include "dv_bucket.h"
+#include "EXTERN.h"
+#include "perl.h"
 #include <stdio.h>
 
@@ -16 +18 @@
 
 dv_bucket_item *
-dv_bucket_item_create(struct timeval *tp)
+dv_bucket_item_create(double time)
 {
     dv_bucket_item *item;
@@ -22 +24 @@
     item = (dv_bucket_item *) malloc( sizeof(dv_bucket_item) );
     item->next = NULL;
-    item->time = dv_bucket_timeval2double(tp);
+    item->time = time;
     return item;
 }
@@ -33 +35 @@
 
 dv_bucket*
-dv_bucket_create(float interval, unsigned long max)
+dv_bucket_create(double interval, unsigned long max)
 {
     dv_bucket *bucket;
@@ -39 +41 @@
     bucket = (dv_bucket *) malloc( sizeof(dv_bucket));
     bucket->max = max;
-    bucket->interval = (long) interval * DV_1E6;
+    bucket->interval = interval * DV_1E6;
     bucket->count = 0;
     bucket->head = NULL;
     bucket->tail = NULL;
     return bucket;
+}
+
+long
+dv_bucket_max_items(dv_bucket *bucket)
+{
+    return bucket->max;
+}
+
+double
+dv_bucket_interval(dv_bucket *bucket)
+{
+    return bucket->interval / DV_1E6;
 }
 
@@ -131 +145 @@
 
 void
-dv_bucket_push(dv_bucket *bucket, struct timeval *tp)
-{
-    dv_bucket_item *item = dv_bucket_item_create(tp);
+dv_bucket_push(dv_bucket *bucket, double time)
+{
+    dv_bucket_item *item = dv_bucket_item_create(time);
     if (bucket->count == 0) {
         bucket->head = item;
@@ -155 +169 @@
 
     if ( dv_bucket_count( bucket ) == 0 ) {
-        dv_bucket_push( bucket, &t );
+        dv_bucket_push( bucket, dv_bucket_timeval2double(&t) );
         return 1;
     }
@@ -163 +177 @@
     }
 
-    dv_bucket_push( bucket, &t );
+    dv_bucket_push( bucket, dv_bucket_timeval2double(&t) );
     return 1;
 }
+
+SV *
+dv_bucket_serialize(dv_bucket *bucket)
+{
+    SV *sv = newSVpv("[", 1);
+    dv_bucket_item *item = bucket->head;
+
+    while (item) {
+        sv_catpvf(sv, "%f%s", item->time, item->next ? "," : "");
+        item = item->next;
+    }
+
+    sv_catpv(sv, "]");
+    return sv;
+}
+
+dv_bucket *
+dv_bucket_deserialize(char *buf, size_t len, double interval, unsigned long max)
+{
+    dv_bucket *bucket = dv_bucket_create(interval, max);
+    char *start;
+    char *end = buf + len;
+
+    if (buf != end && *buf == '[') {
+        buf++;
+        while (buf != end && !isdigit(*buf)) {
+            buf++;
+        }
+    }
+
+    while (buf != end) {
+        start = buf;
+        while ((isdigit(*buf) || *buf == '.' ) ) {
+            buf++;
+        }
+        dv_bucket_push(bucket, strtod(buf, NULL));
+
+        while ( buf != end && ! isdigit(*buf)) {
+            buf++;
+        }
+    }
+    return bucket;
+}
+
 
 dv_bucket_item *

lang/perl/Data-Valve/trunk/dv_bucket.h

@@ -14 +14 @@
 typedef struct dv_bucket {
     unsigned long max;
-    unsigned long interval;
+    double interval;
     unsigned long count;
     dv_bucket_item *head;
@@ -21 +21 @@
 
 /* Creates a new bucket */
-dv_bucket *dv_bucket_create(float interval, unsigned long max);
+dv_bucket *dv_bucket_create(double interval, unsigned long max);
 
 #endif /* __DV_BUCKET_H__ */

lang/perl/Data-Valve/trunk/lib/Data/Valve/Bucket.pm

@@ -9 +9 @@
     
     return $self;
+}
+
+sub deserialize {
+    my ($class, @args) = @_;
+    return bless _deserialize(@args), $class;
 }
 

lang/perl/Data-Valve/trunk/t/02_bucket.t

@@ -1 +1 @@
 use strict;
-use Test::More (tests => 20);
+use Test::More (tests => 24);
 
 BEGIN
@@ -15 +15 @@
     ok($bucket);
     isa_ok($bucket, "Data::Valve::Bucket");
+    ok($bucket->interval == 10, "interval is 10");
 }
 
@@ -40 +41 @@
     ok(! $item->next );
 
+    my $serialized = $bucket->serialize();
+    like($serialized, qr/^\[(?:(?:[\d\.]+,?))+\]$/, "serialization format ok");
+
+    my $bucket2 = Data::Valve::Bucket->deserialize($serialized, 10, 5);
+
+    is($bucket2->interval, 10, "interval is 10");
+    is($bucket2->max_items, 5, "max_items is 5");
 }