Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include token counts in trace output. 

Don't let tokensFree go negative.
This commit is contained in:
sommerfeld 2000-12-30 16:38:22 +00:00
parent 7c10055175
commit 1ef47ae656
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.43 2000/12/30 15:58:34 sommerfeld Exp $ */
/* $NetBSD: job.c,v 1.44 2000/12/30 16:38:22 sommerfeld Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: job.c,v 1.43 2000/12/30 15:58:34 sommerfeld Exp $";
static char rcsid[] = "$NetBSD: job.c,v 1.44 2000/12/30 16:38:22 sommerfeld Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: job.c,v 1.43 2000/12/30 15:58:34 sommerfeld Exp $");
__RCSID("$NetBSD: job.c,v 1.44 2000/12/30 16:38:22 sommerfeld Exp $");
#endif
#endif /* not lint */
#endif
@ -3327,8 +3327,8 @@ void Job_ServerStart(maxproc)
/*
* this tracks the number of tokens currently "out" to build jobs.
*/
static int tokensOutstanding = 0;
static int tokensFree = 0;
int jobTokensRunning = 0;
int jobTokensFree = 0;
/*-
*-----------------------------------------------------------------------
* Job_TokenReturn --
@ -3340,11 +3340,11 @@ static int tokensFree = 0;
void
Job_TokenReturn()
{
tokensOutstanding--;
if (tokensOutstanding < 0)
jobTokensRunning--;
if (jobTokensRunning < 0)
Punt("token botch");
if (tokensOutstanding)
tokensFree++;
if (jobTokensRunning)
jobTokensFree++;
}
/*-
@ -3373,16 +3373,16 @@ Job_TokenWithdraw()
if (aborting)
return FALSE;
if (tokensOutstanding == 0) {
if (jobTokensRunning == 0) {
if (DEBUG(JOB))
printf("first one's free\n");
tokensOutstanding++;
jobTokensRunning++;
wantToken = FALSE;
return TRUE;
}
if (tokensFree > 0) {
tokensFree--;
tokensOutstanding++;
if (jobTokensFree > 0) {
jobTokensFree--;
jobTokensRunning++;
wantToken = FALSE;
return TRUE;
}
@ -3399,7 +3399,7 @@ Job_TokenWithdraw()
return FALSE;
}
wantToken = FALSE;
tokensOutstanding++;
jobTokensRunning++;
if (DEBUG(JOB))
printf("withdrew token\n");
return TRUE;
@ -3418,8 +3418,9 @@ Job_TokenFlush()
{
if (compatMake) return;
while (tokensFree-- > 0) {
while (jobTokensFree > 0) {
JobTokenAdd();
jobTokensFree--;
}
}

4
usr.bin/make/job.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.h,v 1.13 2000/12/30 14:21:23 sommerfeld Exp $ */
/* $NetBSD: job.h,v 1.14 2000/12/30 16:38:22 sommerfeld Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -222,6 +222,8 @@ typedef struct Shell {
} Shell;
extern int job_pipe[2]; /* token pipe for jobs. */
extern int jobTokensRunning; /* tokens currently "out" */
extern int jobTokensFree; /* tokens free but not yet released to pipe */
#ifdef REMOTE
extern char *targFmt; /* Format string for banner that separates

9
usr.bin/make/trace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trace.c,v 1.1 2000/12/29 23:11:08 sommerfeld Exp $ */
/* $NetBSD: trace.c,v 1.2 2000/12/30 16:38:22 sommerfeld Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,11 +38,11 @@
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: trace.c,v 1.1 2000/12/29 23:11:08 sommerfeld Exp $";
static char rcsid[] = "$NetBSD: trace.c,v 1.2 2000/12/30 16:38:22 sommerfeld Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: trace.c,v 1.1 2000/12/29 23:11:08 sommerfeld Exp $");
__RCSID("$NetBSD: trace.c,v 1.2 2000/12/30 16:38:22 sommerfeld Exp $");
#endif /* not lint */
#endif
@ -105,8 +105,9 @@ Trace_Log(event, job)
gettimeofday(&now, NULL);
fprintf(trfile, "%ld.%06d %s %d %s",
fprintf(trfile, "%ld.%06d %d %d %s %d %s",
now.tv_sec, (int)now.tv_usec,
jobTokensRunning, jobTokensFree,
evname[event], trpid, trwd);
if (job != NULL) {
fprintf(trfile, " %s %d %x %x", job->node->name,