Changeset 323

Timestamp:

03/04/08 21:10:13 (9 months ago)

Author:

jake

Message:

fixed thread saftey issue

Location:

trunk/thrudex

Files:

• src/CLuceneIndex.cpp (modified) (4 diffs)
• src/Thrudex.thrift (modified) (1 diff)
• test/Makefile (modified) (1 diff)
• test/aol-query.pl (modified) (2 diffs)
• test/dup-test.pl (modified) (3 diffs)

trunk/thrudex/src/CLuceneIndex.cpp

@@ -156 +156 @@
         modifier->flush();
 
-        ram_searcher  = shared_ptr<IndexSearcher>(new IndexSearcher( ram_directory.get() ));
+        ram_searcher.reset(new IndexSearcher( ram_directory.get() ));
 
         //since clucene doesn't use shared_ptr we need to get the
@@ -165 +165 @@
 
         if(syncing){
-            ram_prev_searcher  = shared_ptr<IndexSearcher>(new IndexSearcher( ram_prev_directory.get() ));
+            ram_prev_searcher.reset(new IndexSearcher( ram_prev_directory.get() ));
             searchers[2] = ram_prev_searcher.get();
             searchers[3] = NULL;
@@ -172 +172 @@
         }
 
-        searcher  = shared_ptr<MultiSearcher>( new MultiSearcher( searchers ) );
+        searcher.reset( new MultiSearcher( searchers ) );
 
         last_refresh = Util::currentTime();
@@ -279 +279 @@
     }
 
+
+    //making sure references to underlying objects stay above 0
+    //for the duration of this function
+    shared_ptr<CLuceneRAMDirectory> l_ram_directory      = ram_directory;
     shared_ptr<CLuceneRAMDirectory> l_ram_prev_directory = ram_prev_directory;
+    shared_ptr<IndexSearcher>       l_ram_searcher       = ram_searcher;
+    shared_ptr<IndexSearcher>       l_ram_prev_searcher  = ram_prev_searcher;
+    shared_ptr<IndexSearcher>       l_disk_searcher      = disk_searcher;
+
 
     shared_ptr<MultiSearcher> l_searcher    = this->getSearcher();

trunk/thrudex/src/Thrudex.thrift

@@ -1 +1 @@
 cpp_namespace thrudex
 php_namespace Thrudex
+ruby_namespace Thrudex
 perl_package  Thrudex
 java_package  thrudex

trunk/thrudex/test/Makefile

@@ -11 +11 @@
 
 all: ../src/Thrudex.thrift
-        $(THRIFT) -perl ../src/Thrudex.thrift
+        $(THRIFT) -perl -rb ../src/Thrudex.thrift
 
 clean:
-        rm -fr gen-perl
+        rm -fr gen-perl gen-rb

trunk/thrudex/test/aol-query.pl

@@ -37 +37 @@
         $i++;
 
+
         if( $i % 100 == 0 ){
             print "Found ".$r->total."\n";
@@ -42 +43 @@
 
     }
-
 
     $transport->close();

trunk/thrudex/test/dup-test.pl

@@ -14 +14 @@
 
 use Thrudex;
+use Time::HiRes qw(gettimeofday);
 
 my $socket    = new Thrift::Socket('localhost',9099);
@@ -19 +20 @@
 my $protocol  = new Thrift::BinaryProtocol($transport);
 my $client    = new ThrudexClient($protocol);
+
 
 my $index  = shift;
@@ -48 +50 @@
 
     my $i = 0;
+    my $last_i = 0;
+    my $t0 = gettimeofday();
+
     while(1){
         my $r = $client->search( $q );
         $i++;
 
-        if($r->total == 2){
+        if($r->total > 1){
             die "Found ".$r->total."\n";
         }elsif($i % 1000){
-            print "Found ".$r->total."\n";
+            #print "Found ".$r->total."\n";
         }
 
-        print $client->put($d);
+
+        my $t1 = gettimeofday();
+
+        if(($t1 - $t0) > 1){
+
+            warn(($i - $last_i)." loops in ".sprintf("%0.2f",($t1-$t0))."sec, $i total\n");
+
+            $t0       = $t1;
+
+            $last_i   = $i;
+        }
+
+        #print $client->put($d);
     }