Changeset 29432

Timestamp:

Oct 15, 2010, 10:00:46 AM (16 years ago)

Author:

bills

Message:

postage stamp server updates from the trunk

Location:

tags/ipp-20100823

Files:

• PS-IPP-PStamp (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (2 diffs)
• pstamp (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (2 diffs)
• pstamp/scripts/pstampstopfaulted (modified) (1 diff)
• pstamp/src (modified) (1 prop)
• pstamp/src/ppstampMakeStamp.c (modified) (1 prop)

tags/ipp-20100823/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -385 +385 @@
 
         next if $image->{fault};
-        next if ($stage ne "raw") and $image->{quality};
+        if (($stage ne "raw") and $image->{quality}) {
+            print STDERR "Selected $stage image has bad quality. Skipping.\n";
+            next;
+        }
 
         if ($base_name) {
@@ -1222 +1225 @@
                 my $images = runToolAndParse($command, $verbose);
                 if (!defined $images) {
-                    print "No components containing coordinates found for ${stage}_id $stage_id\n";
-                    foreach my $row (@$rowList) {
-                        # XXX: This doesn't seem like the correct error code?
-                        $row->{error_code} = $PSTAMP_NO_OVERLAP;
-                    }
+                    print "No  $c found for $stage ${stage}_id $stage_id\n";
                     next;
                 }

tags/ipp-20100823/pstamp/scripts/pstampparse.pl

@@ -805 +805 @@
 {
     my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $component, $need_magic) = @_;
-
-    if (($stage ne 'chip') and ($stage ne 'raw')) {
-        # XXX: The update process for warp and subsequent stages requires that destreaking to be performed
-        # because the -pending queries require the inputs to have magicked >= 0
-        # This is too conservative. For example stage is warp and the warp has never been destreaked we don't
-        # need magic either
-        # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
-        # maybe we should put all of the smarts there and interpret the need_magic flag in the dependent as
-        # "The client needs to have magic performed" and let
-        # XXX: note the very nasty hard coding of gpc1
-        $need_magic = 1 if $imagedb eq 'gpc1';
-    }
 
     # chipRun's can be in full state if destreaking is necessary
@@ -913 +901 @@
                     # cause the image to be re-made
                     # set up to queue an update run
+                    my $require_magic = ($need_magic or $image->{magicked});
                     get_dependent(\$$r_newState, \$$r_fault, $r_dep_id, $image->{imagedb}, 
-                        $run_state, $stage, $image->{stage_id}, $image->{component}, $need_magic);
+                        $run_state, $stage, $image->{stage_id}, $image->{component}, $require_magic );
                 }
             }

tags/ipp-20100823/pstamp/scripts/pstampstopfaulted

@@ -6 +6 @@
 # 25 is PSTAMP_NOT_AVAILABLE
 fault_code=25
-fault_count=5
+fault_count=3
 
 date