From nobody Mon Sep 02 09:56:27 2024 X-Original-To: dev-commits-src-main@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 4Wy40C2JsMz5MvHv; Mon, 02 Sep 2024 09:56:27 +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 4Wy40C1WFRz4KbG; Mon, 2 Sep 2024 09:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725270987; 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=ohAQ8V2+mfrqAoJsTkQCXskZqjxsA26JW6n4WF4IXWA=; b=W43CR67Wo9wllD9ljIQ8Lqyc2ghljmWTe1plbjnls360JbIczZFCKEYNvvCZzezn5zEfOL Qtsk2hEFp5tZYFDYdEb9TB0r7PzdkSEWFdJpA/oD17sA7hXmV3TdmU1Jom+tTt55gJsI71 BZAuU/6qCf1K7U0bLQpCwRCTBGFmfNtnrfQFh6rbHd9NsdoDDjooQytX6YIKPbRBxcLtGd drqjtRkAvUAsDH1+wdUL0Hk/lGAFugnaEQmQUGnhN+Bn1GrIuwK8QfiWGPhBY8eNwVpEKc xXCabLWMtS6CerO4qPy52yf5ZjpxDTx+Zc+VUyRu+AI72FWvUk+V146VUlME2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725270987; a=rsa-sha256; cv=none; b=v04Zweg4wGB84yOZkNe+uaSAKjK2AAa/S+4TFMOW62+RrvllgHc+THCDA7K9k7D6riq1R+ l91Rho2LJHCahTOrYhs3Ryr2MlM2OCEKprNeCrPiz7D6tMJB4WnbaNovma943xLQ8T1TK/ IxPWHAcyg1qn3RBriGQOlgRFsC7aXrELOzrkuoxt8N/tBPqzqwP6uRB17aos5PqYzigWJ3 u8hw8hKnLjJtEs2KuumVIio5u92FxWkJK9VxYwM1Faoz9yopgd/Um1hUCWDA9CjorRkT9z QUcsSysVjOUXv2GNmbicmBSynzQZj1FmYtC5UqOUwYtz6ZMXlmfk/RkYXX1rQQ== 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=1725270987; 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=ohAQ8V2+mfrqAoJsTkQCXskZqjxsA26JW6n4WF4IXWA=; b=pczDzEq843XzvQZnzR19BtTcqyu8LL7WRc1DbLvY0pYLRILZcdOQee1ambn4YB2vGW7dCe O+RyaAx/ApC9Oa9DaNqNwTae9C0HDXumarXfRZ46MZtPuvj5J771/HXC/WrbxNEDZIYvv0 ZrMgoaCPOEaZvLWuzeToyKTNijlw06VPw/xSi9eD+9MymCURaXAf/W8B5MALlW20IIhwU9 IcJfNXQFafhBJ/AWuXFVDk1qEi3muAp6MRp4iv/1G8Ca8maB+32Twju0RFLkvSKxm1fCgl rsiu3f3Nxb16+iDE0kUFjKI40c8OaKchUC3dOP7wfb6skO8dnsm6bGwziimeyw== 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 4Wy40C14PXz17Fc; Mon, 2 Sep 2024 09:56:27 +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 4829uR74018132; Mon, 2 Sep 2024 09:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4829uRjl018129; Mon, 2 Sep 2024 09:56:27 GMT (envelope-from git) Date: Mon, 2 Sep 2024 09:56:27 GMT Message-Id: <202409020956.4829uRjl018129@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: 9867b4af50c6 - main - Makefile.inc1: show time for `make installworld' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9867b4af50c627586c68b26ddc5a7344286eefaf Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=9867b4af50c627586c68b26ddc5a7344286eefaf commit 9867b4af50c627586c68b26ddc5a7344286eefaf Author: Wolfram Schneider AuthorDate: 2024-09-02 09:55:10 +0000 Commit: Wolfram Schneider CommitDate: 2024-09-02 09:55:10 +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 -------------------------------------------------------------- This is an improved version of commit e5a0202f96948a95bf1b879727e155a4f1d1da93 PR: 280187 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 5400cb5e734a..a4e2889004b7 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(reinstall) || make(restage) +_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