From owner-cvs-src@FreeBSD.ORG Fri Nov 12 08:58:07 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA22316A4CE; Fri, 12 Nov 2004 08:58:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA57A43D49; Fri, 12 Nov 2004 08:58:07 +0000 (GMT) (envelope-from phk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAC8w7GY088957; Fri, 12 Nov 2004 08:58:07 GMT (envelope-from phk@repoman.freebsd.org) Received: (from phk@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAC8w7ng088956; Fri, 12 Nov 2004 08:58:07 GMT (envelope-from phk) Message-Id: <200411120858.iAC8w7ng088956@repoman.freebsd.org> From: Poul-Henning Kamp Date: Fri, 12 Nov 2004 08:58:07 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/make job.c job.h main.c make.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 08:58:07 -0000 phk 2004-11-12 08:58:07 UTC FreeBSD src repository Modified files: usr.bin/make job.c job.h main.c make.c Log: Add code to enforce the paralleism count (-j N) for the entire tree of submakes spawned during processing. We create a fifo and stuff one character into it for each job we are allowed to run. The name of the fifo is passed to child processes in the MAKE_JOBS_FIFO environment variable. A make which finds this variable on startup will open the fifo and only spawn jobs when it managed to read a token from the fifo. When the job completes a token is writen back to the fifo. Slave make processes get one token for free: the one their parent make got in order to run them. This makes the make processes themselves invisible in the process counts. The net effect is that "make -j 12 -s buildworld" will start at most 12 jobs at the same time, instead of as previously up to 65 jobs would get started. Revision Changes Path 1.57 +114 -28 src/usr.bin/make/job.c 1.26 +1 -1 src/usr.bin/make/job.h 1.96 +2 -0 src/usr.bin/make/main.c 1.25 +2 -2 src/usr.bin/make/make.c