Changeset 29429

Timestamp:

Oct 15, 2010, 9:53:06 AM (16 years ago)

Author:

bills

Message:

move check for dependent needs to be destreaked so that it can take the state
of the component into account. destreaking is required if component has magicked < 1
or the client requires it.

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (2 diffs)

trunk/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 );
                 }
             }