From nobody Sat Jul 13 10:39:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WLlMq6gDNz5QVv4; Sat, 13 Jul 2024 10:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLlMq629Kz46Mh; Sat, 13 Jul 2024 10:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720867191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plcL5x94cDVuo7LH/dI9icbXD0qGzlsMA13C/q4dUFI=; b=gIcOr18mH3NhCFuaPkYvikBYzUYKKu//bIsBsrBN0Zd3pH0LyDceFx2s7ntaW7gTZFP5Cu /MlNGy8PJFWEV8bsotbl84SHLMYJJwMCVdJwMiYYy69cyw+IaRd6gIL3BptBbn4NfEUlwi e12KI3OSp0BQ6fVdOwylUagEfoBhvhrLgQIOYr6cN2fwfhjluOvmqfYycitazANXdpkCif lI8KsWNNYbhmucjnHmdsFj/gozhMBvVOQdA4brzByO0B92fB19dHIgVoKorE1MOrCs0g8O Lzi7zyJJkP/PtGU0OCChwt1mUXK76+SDrqj8rFo14YkJfjfmsM63VJmorJT+Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720867191; a=rsa-sha256; cv=none; b=YXrF3LH6qpgjxOrfySCthZbcPFBlneJRbFEW2Pryo8NkW8FladsU5eU5hz2wcTSFh4xN1/ CZuGzHsaAKKHPdY0lED95AfC7IGSpTGFa25YQRSUI5UEM5mrqZzdMm3KnwrYtgORaXxzdN o3/ewmDLd1M7WOBeP4+kxhN6FRbzntcsBBtI4iw/4Ui5HMKL+POzdFsVzP6YTaWAEsVs/T 0JwpfFtCTubgYsLDn5/R+DB1KpVTv4sj2SZ914ng52RD3PN5K8xiv3jrG305F5QLKodfVb XqJD7HrZInUT6kXUB9b5d97Uq9hHzdz5U6vgK/DpVRFXtfDFVkr8jJymlv9bfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720867191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plcL5x94cDVuo7LH/dI9icbXD0qGzlsMA13C/q4dUFI=; b=XOzYbGnRiqdIWrYh0CiuIEKm9UZfpPPcUAcfneXAJYNxdBgeCtxSH70kXBjsnIJ539jRrG ezZ1h3EbwYw4tbKUwhCRl+J9DxVH/5oP2ZbG7T2iX3L59gss4O9ud+iOMjxC0BuYyVO7So bi0NxRAoJDMt/GT/snPGdFrCwe9npIJWczcLzQd5mhT5NEPuIAYZwPrCxqHWUgiP/P/opM WhlLQQrICn5i++j7fZGKeWAGIz6oGQEt7S5AoSlRQH4cj0x13UCuvD3B3EN+/yZ1Kt25iD oaW//V4h0DK48c++398yRtdXhaZLbhPcR6WawKLkTFmx2IYr9vAujp+aeINLcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WLlMq5ClJzNXy; Sat, 13 Jul 2024 10:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46DAdp7d060635; Sat, 13 Jul 2024 10:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46DAdpeF060632; Sat, 13 Jul 2024 10:39:51 GMT (envelope-from git) Date: Sat, 13 Jul 2024 10:39:51 GMT Message-Id: <202407131039.46DAdpeF060632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: e5a0202f9694 - main - Makefile.inc1: show time for `make installworld' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5a0202f96948a95bf1b879727e155a4f1d1da93 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e5a0202f96948a95bf1b879727e155a4f1d1da93 commit e5a0202f96948a95bf1b879727e155a4f1d1da93 Author: Wolfram Schneider AuthorDate: 2024-07-13 10:37:14 +0000 Commit: Wolfram Schneider CommitDate: 2024-07-13 10:37:14 +0000 Makefile.inc1: show time for `make installworld' For years we display the time in seconds how long it takes to run `make buildworld' (see PR 224433). Now we will display the time for "installworld" and "installkernel" as well. e.g.: -------------------------------------------------------------- >>> Installing everything completed on Sun Jul  7 16:11:37 UTC 2024 >>> Install world completed in 110 seconds, ncpu: 2, make -j2 -------------------------------------------------------------- PR: 280187 Approved by: imp Differential Revision: https://reviews.freebsd.org/D45912 --- Makefile.inc1 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 19ed923702b1..7ff961e22e7a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1241,11 +1241,19 @@ WMAKE_TGTS+= build${libcompat} .endif WMAKE_TGTS+= everything -# record buildworld time in seconds +# record buildworld / install time in seconds .if make(buildworld) _BUILDWORLD_START!= date '+%s' .export _BUILDWORLD_START .endif +.if make(installworld) +_INSTALLWORLD_START!= date '+%s' +.export _INSTALLWORLD_START +.endif +.if make(installkernel) +_INSTALLKERNEL_START!= date '+%s' +.export _INSTALLKERNEL_START +.endif buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .PHONY .ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue @@ -1313,11 +1321,11 @@ kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY installcheck: _installcheck_world _installcheck_kernel .PHONY _installcheck_world: .PHONY @echo "--------------------------------------------------------------" - @echo ">>> Install check world" + @echo ">>> Install check world started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" _installcheck_kernel: .PHONY @echo "--------------------------------------------------------------" - @echo ">>> Install check kernel" + @echo ">>> Install check kernel started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" # @@ -1641,6 +1649,8 @@ restage reinstall: .MAKE .PHONY .endfor @echo "--------------------------------------------------------------" @echo ">>> Installing everything completed on `LC_ALL=C date`" + @seconds=$$(($$(date '+%s') - ${_INSTALLWORLD_START})); \ + echo ">>> Install world completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" redistribute: .MAKE .PHONY @@ -1873,6 +1883,9 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" + @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \ + echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" + @echo "--------------------------------------------------------------" .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" .for _kernel in ${BUILDKERNELS:[2..-1]} @@ -1887,6 +1900,9 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY @echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" .endfor + @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \ + echo ">>> Install kernel(s) ${BUILDKERNELS} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" + @echo "--------------------------------------------------------------" .endif distributekernel distributekernel.debug: .PHONY