Changeset 10

Timestamp:

11/20/10 20:31:08 (14 years ago)

Author:

nanardon

Message:

• paralize path update

Location:

web/trunk

Files:

• bin/sophie_scan (modified) (1 diff)
• lib/Sophie/Base/Header.pm (modified) (1 diff)

web/trunk/bin/sophie_scan

@@ -70 +70 @@
     if (my $pid = fork()) {
     } else {
-        foreach my $pathkey (@pkey) {
-            my @delta = Sophie::Base::RpmsPath->new($pathkey)
-                ->find_delta;
-            while (my @d = splice(@delta, 0, 25)) {
-                my $path = Sophie::Base::RpmsPath->new($pathkey);
-                $path->update_content(@d);
-                $path->db->disconnect;
+
+
+        my $NB_PAR = 2;
+        my @split;
+        my $div = @pkey / $NB_PAR;
+
+        for (my $i = 0; $i < $NB_PAR - 1; $i++) {
+            $split[$i] = [ splice(@pkey, 0, $div) ];
+        }
+        $split[$NB_PAR -1] = [ @pkey ];
+        foreach my $job (@split) {
+            @{$job || []} or next;
+
+            if (fork()) {
+            } else {
+
+                foreach my $pathkey (@{ $job }) {
+                    my @delta = Sophie::Base::RpmsPath->new($pathkey)
+                    ->find_delta;
+                    while (my @d = splice(@delta, 0, 25)) {
+                        my $path = Sophie::Base::RpmsPath->new($pathkey);
+                        $path->update_content(@d);
+                        $path->db->disconnect;
+                    }
+                    Sophie::Base::RpmsPath->new($pathkey)->set_updated;
+                }
+                exit(0);
             }
-            Sophie::Base::RpmsPath->new($pathkey)->set_updated;
         }
-        exit(0);
+        1 while(waitpid(-1, 0) <= 0);
     }
     return 1;

web/trunk/lib/Sophie/Base/Header.pm

@@ -89 +89 @@
                     $content = $enc->decode($content);
 
+                    $self->db->pg_savepoint('FILECONTENT');
                     $add_content->execute(
                         $enc && ref $enc ? encode('utf8', $enc->decode($content)) : $content,
                         $$self,
-                        $entry->{count});
+                        $entry->{count}) or do {
+                        $self->db->pg_rollback_to('FILECONTENT');
+                    };
                 } else {
                 }