From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E9D97385840B for ; Wed, 5 Jun 2024 13:27:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E9D97385840B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E9D97385840B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717594037; cv=none; b=D459vbBS6FwCLEkbE0amrxabMxQKcoAL7lk+6QM59Q4Bk2j3Krg+JEeOG6N2M7Bp1vAQOsSvoZv1Ndj5gaaWIkgq4Q7hfNq+7TLECnlNx8RlbZgoqMS8SGqaolVPCj1ZmY1M4HneGl2ssdQG3q93Or1TqWFIPHEgeh2GjyybjoI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717594037; c=relaxed/simple; bh=twngJ8BsMSev5T0JJ7xFLVHe5McbcUp8syDGZvPIvUc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=TUNboidbA9l2kRAwz0SRYA+BWGAN49A3A49UBZ8uNmeW7cJHF9bMv3ly31jbJqVpnKXflIfAm8H9afhpUdp6YZic9yrnRCEdsW83GJQhVU2wpFpq4+aza0vOgxq3gZZBL5/xLsC19gE6khKH1d223OoloMKgej3KYGaYkIZjhB0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717594034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oujXuJLo2CVEtkhQrZzVD3aKyZV9PPjGcWoFaiWTR1A=; b=bMTXYvp0SYRuU01juud/iqfAzK6etLk4+m4ABxPVhqSa7jB+FLhrHTViwpA8YeTOiAvjxv qw4UM7zv+lF01IIRMUTwF+9sCuv/i1a34Bs5Qu37cwZTrey0wvqD3D8CqkRJtDkVqHnUb7 Y2EAp4bo++3/7kaVr+hPFqVTYbkp/+I= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-WSNOkVVBMd2agli-tAecag-1; Wed, 05 Jun 2024 09:27:13 -0400 X-MC-Unique: WSNOkVVBMd2agli-tAecag-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4215a37801aso781755e9.2 for ; Wed, 05 Jun 2024 06:27:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717594031; x=1718198831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oujXuJLo2CVEtkhQrZzVD3aKyZV9PPjGcWoFaiWTR1A=; b=rknOXLjQRrfWgMFf61T6KtzBaMKIjqawjGpGrsbLJrfCzTLcdJy5b8TlDLYWH73Hca c7yqxtlOGSIZH995TK7R4UHge/UhxmInUKBSneWmY30zSqimZ7gT4ikgd4H9oAOlaGha 9Ynld9jtKXkH/C0ib8R8oT2TsrxlbzncR0ILxY0thqHb8wH6XBIr8JRBfM083eBUsoRB 0YyTCffCvfihgD0Jm6nulblUtgzA7ly8i/BShK44t4PZBVF+cMPKt4OIiFkuyir8vxKU DaHMtvgZRppKCMqrEUWlbAftZcP+hWFbuw4SMjcH2nRlZVsIO+ixLlpUYV8CVSFXVRnV o/wQ== X-Gm-Message-State: AOJu0YyixChdMIssfeTHLiuXX1YvMWjOEcYQMlsiRluHgkE6lzc46lfy 9c+ySXX6eN/oetLwTYserYFv8pWrYn7I0Dk+Bkw/dVxd8jlayBINoottw/9Tkva08a41pz7+iQ4 0/SBlWeWTnfOEK0xVVgcAYVOhNCtokDQserfZyT9x9OrggSS40cWcykNyHLZ/lcsC5EY5hhQCzP ioq42lIC8zhDiMzpBWGpcsRzfPbK3pfbBEKVpXhE+x46w= X-Received: by 2002:a05:600c:3c94:b0:420:78f:3f87 with SMTP id 5b1f17b1804b1-421562dd26emr24085655e9.11.1717594031169; Wed, 05 Jun 2024 06:27:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHK8D8jnoouw1HB7fkt+Va/h9OAb5FtLragrJX+GBCrDDkVnfzVEGACEMb+H3U0oTthSu431Q== X-Received: by 2002:a05:600c:3c94:b0:420:78f:3f87 with SMTP id 5b1f17b1804b1-421562dd26emr24085455e9.11.1717594030658; Wed, 05 Jun 2024 06:27:10 -0700 (PDT) Received: from localhost ([31.111.84.186]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42158148f43sm22166915e9.33.2024.06.05.06.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 06:27:09 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 1/2] gdb/testsuite: restructure gdb_data_cache (lib/cache.exp) Date: Wed, 5 Jun 2024 14:27:03 +0100 Message-Id: <2d45fbe4624a71dd07864737383dc5f37d3275a4.1717593822.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: In a later commit I want to add more information to gdb_data_cache (see lib/cache.exp). Specifically I want to track if the underlying function of a caching proc calls gdb_exit or not. Currently gdb_data_cache is an associative array, the keys of which are the name of the caching proc. In this commit I add ',value' suffix to the gdb_data_cache keys. In later commits I'll add additional entries with different suffixes. There should be no noticable changes after this commit, this is just a restructuring. --- gdb/testsuite/lib/cache.exp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/lib/cache.exp b/gdb/testsuite/lib/cache.exp index 80667349f52..e7b9114058b 100644 --- a/gdb/testsuite/lib/cache.exp +++ b/gdb/testsuite/lib/cache.exp @@ -70,8 +70,8 @@ proc gdb_do_cache {name args} { set cache_name [file join [target_info name] $name {*}$args] set is_cached 0 - if {[info exists gdb_data_cache($cache_name)]} { - set cached $gdb_data_cache($cache_name) + if {[info exists gdb_data_cache(${cache_name},value)]} { + set cached $gdb_data_cache(${cache_name},value) verbose "$name: returning '$cached' from cache" 2 if { $cache_verify == 0 } { return $cached @@ -83,9 +83,9 @@ proc gdb_do_cache {name args} { set cache_filename [make_gdb_parallel_path cache $cache_name] if {[file exists $cache_filename]} { set fd [open $cache_filename] - set gdb_data_cache($cache_name) [read -nonewline $fd] + set gdb_data_cache(${cache_name},value) [read -nonewline $fd] close $fd - set cached $gdb_data_cache($cache_name) + set cached $gdb_data_cache(${cache_name},value) verbose "$name: returning '$cached' from file cache" 2 if { $cache_verify == 0 } { return $cached @@ -95,9 +95,9 @@ proc gdb_do_cache {name args} { } set real_name gdb_real__$name - set gdb_data_cache($cache_name) [gdb_do_cache_wrap $real_name {*}$args] + set gdb_data_cache(${cache_name},value) [gdb_do_cache_wrap $real_name {*}$args] if { $cache_verify == 1 && $is_cached == 1 } { - set computed $gdb_data_cache($cache_name) + set computed $gdb_data_cache(${cache_name},value) if { $cached != $computed } { error [join [list "Inconsistent results for $cache_name:" "cached: $cached vs. computed: $computed"]] @@ -105,15 +105,15 @@ proc gdb_do_cache {name args} { } if {[info exists GDB_PARALLEL]} { - verbose "$name: returning '$gdb_data_cache($cache_name)' and writing file" 2 + verbose "$name: returning '$gdb_data_cache(${cache_name},value)' and writing file" 2 file mkdir [file dirname $cache_filename] # Make sure to write the results file atomically. set fd [open $cache_filename.[pid] w] - puts $fd $gdb_data_cache($cache_name) + puts $fd $gdb_data_cache(${cache_name},value) close $fd file rename -force -- $cache_filename.[pid] $cache_filename } - return $gdb_data_cache($cache_name) + return $gdb_data_cache(${cache_name},value) } # Define a new proc named NAME, with optional args ARGS. BODY is the body of -- 2.25.4