[BACK]Return to job.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / usr.bin / make

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.bin/make/job.c between version 1.43 and 1.44

version 1.43, 2000/12/30 15:58:34 version 1.44, 2000/12/30 16:38:22
Line 3327  void Job_ServerStart(maxproc)
Line 3327  void Job_ServerStart(maxproc)
 /*  /*
  * this tracks the number of tokens currently "out" to build jobs.   * this tracks the number of tokens currently "out" to build jobs.
  */   */
 static int tokensOutstanding = 0;  int jobTokensRunning = 0;
 static int tokensFree = 0;  int jobTokensFree = 0;
 /*-  /*-
  *-----------------------------------------------------------------------   *-----------------------------------------------------------------------
  * Job_TokenReturn --   * Job_TokenReturn --
Line 3340  static int tokensFree = 0;
Line 3340  static int tokensFree = 0;
 void  void
 Job_TokenReturn()  Job_TokenReturn()
 {  {
     tokensOutstanding--;      jobTokensRunning--;
     if (tokensOutstanding < 0)      if (jobTokensRunning < 0)
         Punt("token botch");          Punt("token botch");
     if (tokensOutstanding)      if (jobTokensRunning)
         tokensFree++;          jobTokensFree++;
 }  }
   
 /*-  /*-
Line 3373  Job_TokenWithdraw()
Line 3373  Job_TokenWithdraw()
     if (aborting)      if (aborting)
             return FALSE;              return FALSE;
   
     if (tokensOutstanding == 0) {      if (jobTokensRunning == 0) {
         if (DEBUG(JOB))          if (DEBUG(JOB))
             printf("first one's free\n");              printf("first one's free\n");
         tokensOutstanding++;          jobTokensRunning++;
         wantToken = FALSE;          wantToken = FALSE;
         return TRUE;          return TRUE;
     }      }
     if (tokensFree > 0) {      if (jobTokensFree > 0) {
         tokensFree--;          jobTokensFree--;
         tokensOutstanding++;          jobTokensRunning++;
         wantToken = FALSE;          wantToken = FALSE;
         return TRUE;          return TRUE;
     }      }
Line 3399  Job_TokenWithdraw()
Line 3399  Job_TokenWithdraw()
         return FALSE;          return FALSE;
     }      }
     wantToken = FALSE;      wantToken = FALSE;
     tokensOutstanding++;      jobTokensRunning++;
     if (DEBUG(JOB))      if (DEBUG(JOB))
         printf("withdrew token\n");          printf("withdrew token\n");
     return TRUE;      return TRUE;
Line 3418  Job_TokenFlush()
Line 3418  Job_TokenFlush()
 {  {
     if (compatMake) return;      if (compatMake) return;
   
     while (tokensFree-- > 0) {      while (jobTokensFree > 0) {
         JobTokenAdd();          JobTokenAdd();
           jobTokensFree--;
     }      }
 }  }
   
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44
CVSweb <webmaster@jp.NetBSD.org>