Print this page
make: ship the Joyent patch to enable parallel make (originally from rm)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/doname.cc
          +++ new/usr/src/cmd/make/bin/doname.cc
↓ open down ↓ 25 lines elided ↑ open up ↑
  26   26  /*
  27   27   *      doname.c
  28   28   *
  29   29   *      Figure out which targets are out of date and rebuild them
  30   30   */
  31   31  
  32   32  /*
  33   33   * Included files
  34   34   */
  35   35  #include <alloca.h>             /* alloca() */
  36      -#if defined(TEAMWARE_MAKE_CMN)
  37      -#include <avo/util.h>           /* avo_get_user(), avo_hostname() */
  38      -#endif
  39   36  
  40   37  #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  41   38  #       include <avo/strings.h> /* AVO_STRDUP() */
  42   39  #       include <dm/Avo_MToolJobResultMsg.h>
  43   40  #       include <dm/Avo_MToolJobStartMsg.h>
  44   41  #       include <dm/Avo_MToolRsrcInfoMsg.h>
  45   42  #       include <dm/Avo_macro_defs.h> /* AVO_BLOCK_INTERUPTS & AVO_UNBLOCK_INTERUPTS */
  46   43  #       include <dmthread/Avo_ServerState.h>
  47   44  #       include <rw/pstream.h>
  48   45  #       include <rw/xdrstrea.h>
↓ open down ↓ 3245 lines elided ↑ open up ↑
3294 3291   */
3295 3292  void
3296 3293  set_locals(register Name target, register Property old_locals)
3297 3294  {
3298 3295          register Property       conditional;
3299 3296          register int            i;
3300 3297          register Boolean        saved_conditional_macro_used;
3301 3298          Chain                   cond_name;
3302 3299          Chain                   cond_chain;
3303 3300  
3304      -#ifdef DISTRIBUTED
3305 3301          if (target->dont_activate_cond_values) {
3306 3302                  return;
3307 3303          }
3308      -#endif
3309 3304  
3310 3305          saved_conditional_macro_used = conditional_macro_used;
3311 3306  
3312 3307          /* Scan the list of conditional properties and apply each one */
3313 3308          for (conditional = get_prop(target->prop, conditional_prop), i = 0;
3314 3309               conditional != NULL;
3315 3310               conditional = get_prop(conditional->next, conditional_prop),
3316 3311               i++) {
3317 3312                  /* Save the old value */
3318 3313                  old_locals[i].body.macro =
↓ open down ↓ 36 lines elided ↑ open up ↑
3355 3350   *      Global variables used:
3356 3351   *              debug_level     Should we trace activities?
3357 3352   *              recursion_level Used for tracing
3358 3353   */
3359 3354  void
3360 3355  reset_locals(register Name target, register Property old_locals, register Property conditional, register int index)
3361 3356  {
3362 3357          register Property       this_conditional;
3363 3358          Chain                   cond_chain;
3364 3359  
3365      -#ifdef DISTRIBUTED
3366 3360          if (target->dont_activate_cond_values) {
3367 3361                  return;
3368 3362          }
3369      -#endif
3370 3363  
3371 3364          /* Scan the list of conditional properties and restore the old value */
3372 3365          /* to each one Reverse the order relative to when we assigned macros */
3373 3366          this_conditional = get_prop(conditional->next, conditional_prop);
3374 3367          if (this_conditional != NULL) {
3375 3368                  reset_locals(target, old_locals, this_conditional, index+1);
3376 3369          } else {
3377 3370                  /* Remove conditional target from chain */
3378 3371                  if (conditional_targets == NULL ||
3379 3372                      conditional_targets->name != target) {
↓ open down ↓ 343 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX