Changeset 3937

Timestamp:

01/01/08 23:13:00 (5 years ago)

Author:

daisuke

Message:

fix memory management issues

Location:

lang/perl/Senna/trunk

Files:

• lib/Senna.xs (modified) (1 diff)
• lib/Senna/Index.pm (modified) (1 diff)
• lib/Senna/Records.pm (added)
• senna-records.c (modified) (4 diffs)
• t/index/03_simple.t (modified) (1 diff)

lang/perl/Senna/trunk/lib/Senna.xs

@@ -142 +142 @@
 
 SV *
-SennaPerl_Records_next(self)
+SennaPerl_Records__XS_next(self)
+        SV *self;
+    CODE:
+        RETVAL = SennaPerl_Records_next(self);
+    OUTPUT:
+        RETVAL
+
+SV *
+SennaPerl_Records_nhits(self)
         SV *self;
 
 SV *
-SennaPerl_Records_nhits(self)
+SennaPerl_Records_curr_key(self)
         SV *self;
 

lang/perl/Senna/trunk/lib/Senna/Index.pm

@@ -8 +8 @@
 use warnings;
 use Senna::Index::Info;
+use Senna::Records;
 use Senna::Record;
 

lang/perl/Senna/trunk/senna-records.c

@@ -33 +33 @@
     char keybuf[SEN_MAX_KEY_SIZE];
     int score;
-    sen_rc rc;
     SennaPerl_Records *records = XS_STATE(SennaPerl_Records *, obj);
 
-    rc = sen_records_next(records->records, &keybuf, SEN_MAX_KEY_SIZE, &score);
-    if(rc == sen_success) {
+    if (sen_records_next(records->records, &keybuf, SEN_MAX_KEY_SIZE, &score)) {
         dSP;
         ENTER;
@@ -45 +43 @@
         XPUSHs(sv_2mortal(newSVpv("Senna::Record", 13)));
         XPUSHs(sv_2mortal(newSVpv("key", 3)));
-        XPUSHs(sv_2mortal(newSVpv(keybuf, 0)));
+        XPUSHs(sv_2mortal(newSVpvf("%s", keybuf)));
         XPUSHs(sv_2mortal(newSVpv("score", 5)));
         XPUSHs(sv_2mortal(newSViv(score)));
@@ -58 +56 @@
             croak ("Senna::Record::new did not return a proper object");
         }
+        SvREFCNT_inc(sv);
 
         FREETMPS;
@@ -80 +79 @@
 {
     SennaPerl_Records *records = XS_STATE(SennaPerl_Records *, obj);
-SP_DEBUG("Senna::Records::DESTROY");
-SP_DEBUG("sen_records_close()");
     sen_records_close(records->records);
-SP_DEBUG("Safefree()");
     Safefree(records);
-SP_DEBUG("Senna::Records DONE");
+}
+
+SV *
+SennaPerl_Records_curr_key(obj)
+        SV *obj;
+{
+    char keybuf[SEN_MAX_KEY_SIZE];
+    SennaPerl_Records *records = XS_STATE(SennaPerl_Records *, obj);
+    if (sen_records_curr_key(records->records, keybuf, SEN_MAX_KEY_SIZE)) {
+        return newSVpvf("%s", keybuf);
+    }
+    return &PL_sv_undef;
 }
 

lang/perl/Senna/trunk/t/index/03_simple.t

@@ -5 +5 @@
 
 use strict;
-use Test::More (tests => 821);
+use Test::More (tests => 829);
 use File::Spec;
 use File::Temp;