qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 11/46] ninjatool: use constant names for stamp files
Date: Fri,  4 Sep 2020 07:40:47 -0400	[thread overview]
Message-ID: <20200904114122.31307-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com>

Numbering files according to rules causes confusion, because
CUSTOM_COMMAND3.stamp from a previous build might represent
completely different targets after Makefile.ninja is regenerated.
As a result, the new targets are not rebuilt and compilation
fails.

Use the targets to build a SHA1 hash; the chances for collision
are one in 2^24 even with a 12-character prefix of the hash.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/ninjatool.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
index ba6bd9a2a6..627a1cab45 100755
--- a/scripts/ninjatool.py
+++ b/scripts/ninjatool.py
@@ -34,6 +34,7 @@ import os
 import re
 import json
 import argparse
+import hashlib
 import shutil
 
 
@@ -51,6 +52,9 @@ else:
     normpath = os.path.normpath
 
 
+def sha1_text(text):
+    return hashlib.sha1(text.encode()).hexdigest()
+
 # ---- lexer and parser ----
 
 PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}"
@@ -767,7 +771,6 @@ class Ninja2Make(NinjaParserEventsWithVars):
         self.build_vars = defaultdict(lambda: dict())
         self.rule_targets = defaultdict(lambda: list())
         self.stamp_targets = defaultdict(lambda: list())
-        self.num_stamp = defaultdict(lambda: 0)
         self.all_outs = set()
         self.all_ins = set()
         self.all_phony = set()
@@ -903,8 +906,7 @@ class Ninja2Make(NinjaParserEventsWithVars):
             if len(out) == 1:
                 stamp = out[0] + '.stamp'
             else:
-                stamp = '%s%d.stamp' %(rule, self.num_stamp[rule])
-                self.num_stamp[rule] += 1
+                stamp = '%s@%s.stamp' % (rule, sha1_text(targets)[0:11])
             self.print('%s: %s; @:' % (targets, stamp))
             self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, inputs, orderonly))
             self.rule_targets[rule].append(stamp)
-- 
2.26.2




  parent reply	other threads:[~2020-09-04 11:46 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-04 11:40 [PULL 00/46] Next round of Meson bugfixes and cleanups Paolo Bonzini
2020-09-04 11:40 ` [PULL 01/46] qemu-iotests: move check-block back to Makefiles Paolo Bonzini
2020-09-04 11:40 ` [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX Paolo Bonzini
2020-09-04 11:40 ` [PULL 03/46] tests: handling signal on win32 properly Paolo Bonzini
2020-09-04 11:40 ` [PULL 04/46] mtest2make: split environment from test command Paolo Bonzini
2020-09-04 11:40 ` [PULL 05/46] mtest2make: split working directory " Paolo Bonzini
2020-09-04 11:40 ` [PULL 06/46] mtest2make: hide output of successful tests Paolo Bonzini
2020-09-04 11:40 ` [PULL 07/46] mtest2make: unify tests that appear in multiple suites Paolo Bonzini
2020-09-04 11:40 ` [PULL 08/46] meson: remove b_lundef option Paolo Bonzini
2020-09-04 11:40 ` [PULL 09/46] configure: do not include absolute paths in -I and -L paths Paolo Bonzini
2020-09-04 11:40 ` [PULL 10/46] configure: include cross sdl2-config in meson cross file Paolo Bonzini
2020-09-04 11:40 ` Paolo Bonzini [this message]
2020-09-04 11:40 ` [PULL 12/46] meson: fix libqos linking Paolo Bonzini
2020-09-04 11:40 ` [PULL 13/46] meson: build qapi tests library Paolo Bonzini
2020-09-04 11:40 ` [PULL 14/46] meson: declare tasn1 dependency Paolo Bonzini
2020-09-04 11:40 ` [PULL 15/46] meson: declare keyutils dependency Paolo Bonzini
2020-09-04 11:40 ` [PULL 16/46] meson: convert qht-bench Paolo Bonzini
2020-09-04 11:40 ` [PULL 17/46] meson: convert the unit tests Paolo Bonzini
2020-09-04 11:40 ` [PULL 18/46] meson: move keyutils dependency check Paolo Bonzini
2020-09-04 11:40 ` [PULL 19/46] meson: remove old socket_scm_helper rule Paolo Bonzini
2020-09-04 11:40 ` [PULL 20/46] meson: convert vhost-user-bridge Paolo Bonzini
2020-09-04 11:40 ` [PULL 21/46] meson: convert atomic*-bench Paolo Bonzini
2020-09-04 11:40 ` [PULL 22/46] tests: do not print benchmark output to stdout Paolo Bonzini
2020-09-04 11:40 ` [PULL 23/46] meson: convert the speed tests Paolo Bonzini
2020-09-04 11:41 ` [PULL 24/46] tests/migration/stress: remove unused exit_success Paolo Bonzini
2020-09-04 11:41 ` [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30 Paolo Bonzini
2020-09-04 11:41 ` [PULL 26/46] meson: convert migration/initrd-stress Paolo Bonzini
2020-09-04 11:41 ` [PULL 27/46] configure: remove dead code for in-tree builds Paolo Bonzini
2020-09-04 11:41 ` [PULL 28/46] meson: compute config_all_devices directly Paolo Bonzini
2020-09-04 11:41 ` [PULL 29/46] Makefile: remove dead variables and includes Paolo Bonzini
2020-09-04 11:41 ` [PULL 30/46] Makefile: inline the relevant parts of rules.mak Paolo Bonzini
2020-09-04 11:41 ` [PULL 31/46] configure: move disassembler configuration to meson Paolo Bonzini
2020-09-04 11:41 ` [PULL 32/46] configure: move C++ compiler handling " Paolo Bonzini
2020-09-04 11:41 ` [PULL 33/46] meson: keep all compiler flags detection together Paolo Bonzini
2020-09-04 11:41 ` [PULL 34/46] configure: move -ldl test to meson Paolo Bonzini
2020-09-04 11:41 ` [PULL 35/46] configure: remove unnecessary libm test Paolo Bonzini
2020-09-04 11:41 ` [PULL 36/46] configure: do not look for install(1) Paolo Bonzini
2020-09-04 11:41 ` [PULL 37/46] meson: get glib compilation flags from GLIB_CFLAGS Paolo Bonzini
2020-09-04 11:41 ` [PULL 38/46] configure: do not include dependency flags in QEMU_CFLAGS and LIBS Paolo Bonzini
2020-09-04 11:41 ` [PULL 39/46] configure: drop dead variables and functions Paolo Bonzini
2020-09-04 11:41 ` [PULL 40/46] docs: suggest Meson replacements for various configure functions Paolo Bonzini
2020-09-04 11:41 ` [PULL 41/46] configure: update dtc submodule Paolo Bonzini
2020-09-04 11:41 ` [PULL 42/46] oss-fuzz: fix rpath Paolo Bonzini
2020-09-04 11:41 ` [PULL 43/46] meson: specify fuzz linker script as a project arg Paolo Bonzini
2020-09-04 11:41 ` [PULL 44/46] fuzz: Add support for custom fuzzing library Paolo Bonzini
2020-09-04 11:41 ` [PULL 45/46] meson: Convert undefsym.sh to undefsym.py Paolo Bonzini
2020-09-04 11:41 ` [PULL 46/46] meson: remove linkage of sdl to baum Paolo Bonzini
2020-09-06 15:23 ` [PULL 00/46] Next round of Meson bugfixes and cleanups Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200904114122.31307-12-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).