Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/parallel.cc
          +++ new/usr/src/cmd/make/bin/parallel.cc
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26      -#ifdef TEAMWARE_MAKE_CMN
  27   26  
  28   27  /*
  29   28   *      parallel.cc
  30   29   *
  31   30   *      Deal with the parallel processing
  32   31   */
  33   32  
  34   33  /*
  35   34   * Included files
  36   35   */
↓ open down ↓ 25 lines elided ↑ open up ↑
  62   61  
  63   62  
  64   63  /*
  65   64   * typedefs & structs
  66   65   */
  67   66  
  68   67  
  69   68  /*
  70   69   * Static variables
  71   70   */
  72      -#ifdef TEAMWARE_MAKE_CMN
  73   71  static  Boolean         just_did_subtree = false;
  74   72  static  char            local_host[MAXNAMELEN] = "";
  75   73  static  char            user_name[MAXNAMELEN] = "";
  76      -#endif
  77   74  static  int             pmake_max_jobs = 0;
  78   75  static  pid_t           process_running = -1;
  79   76  static  Running         *running_tail = &running_list;
  80   77  static  Name            subtree_conflict;
  81   78  static  Name            subtree_conflict2;
  82   79  
  83   80  
  84   81  /*
  85   82   * File table of contents
  86   83   */
↓ open down ↓ 167 lines elided ↑ open up ↑
 254  251                          if ((commands[i][0] == (int) at_char) ||
 255  252                              (commands[i][0] == (int) hyphen_char)) {
 256  253                                  retmem_mb(commands[i]);
 257  254                          }
 258  255                  }
 259  256                  return res;
 260  257          }
 261  258  }
 262  259  
 263  260  
 264      -#ifdef TEAMWARE_MAKE_CMN
 265  261  #define MAXJOBS_ADJUST_RFE4694000
 266  262  
 267  263  #ifdef MAXJOBS_ADJUST_RFE4694000
 268  264  
 269  265  #include <unistd.h>     /* sysconf(_SC_NPROCESSORS_ONLN) */
 270  266  #include <sys/ipc.h>            /* ftok() */
 271  267  #include <sys/shm.h>            /* shmget(), shmat(), shmdt(), shmctl() */
 272  268  #include <semaphore.h>          /* sem_init(), sem_trywait(), sem_post(), sem_destroy() */
 273  269  #include <sys/loadavg.h>        /* getloadavg() */
 274  270  
↓ open down ↓ 269 lines elided ↑ open up ↑
 544  540                  /* M2 specific initialization */
 545  541                  if (job_adjust_mode == ADJUST_M2) {
 546  542                          if (m2_init()) {
 547  543                                  job_adjust_error();
 548  544                          }
 549  545                  }
 550  546          }
 551  547  }
 552  548  
 553  549  #endif /* MAXJOBS_ADJUST_RFE4694000 */
 554      -#endif /* TEAMWARE_MAKE_CMN */
 555  550  
 556  551  /*
 557  552   *      distribute_process(char **commands, Property line)
 558  553   *
 559  554   *      Parameters:
 560  555   *              commands        argv vector of commands to execute
 561  556   *
 562  557   *      Return value:
 563  558   *                              The result of the execution
 564  559   *
↓ open down ↓ 99 lines elided ↑ open up ↑
 664  659          (void) sprintf(mbstring,
 665  660                          NOCATGETS("%s/dmake.stdout.%d.%d.XXXXXX"),
 666  661                          tmpdir,
 667  662                          getpid(),
 668  663                          file_number++);
 669  664  
 670  665          mktemp(mbstring);
 671  666  
 672  667          stdout_file = strdup(mbstring);
 673  668          stderr_file = NULL;
 674      -#if defined (TEAMWARE_MAKE_CMN)
      669 +
 675  670          if (!out_err_same) {
 676  671                  (void) sprintf(mbstring,
 677  672                                  NOCATGETS("%s/dmake.stderr.%d.%d.XXXXXX"),
 678  673                                  tmpdir,
 679  674                                  getpid(),
 680  675                                  file_number++);
 681  676  
 682  677                  mktemp(mbstring);
 683  678  
 684  679                  stderr_file = strdup(mbstring);
 685  680          }
 686      -#endif
 687  681  
 688  682          process_running = run_rule_commands(local_host, commands);
 689  683  
 690  684          return build_running;
 691  685  }
 692  686  
 693  687  /*
 694  688   *      doname_parallel(target, do_get, implicit)
 695  689   *
 696  690   *      Processes the given target and finishes up any parallel
↓ open down ↓ 1223 lines elided ↑ open up ↑
1920 1914          if(rp->sprodep_value) {
1921 1915                  free_name(rp->sprodep_value);
1922 1916          }
1923 1917          if(rp->sprodep_env) {
1924 1918                  retmem_mb(rp->sprodep_env);
1925 1919          }
1926 1920          retmem_mb((char *) rp);
1927 1921  
1928 1922  }
1929 1923  
1930      -#endif
1931 1924  
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX