From patchwork Wed Jul 24 22:18:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1964565 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ow7kiPl5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WTpQj1k90z1yY9 for ; Thu, 25 Jul 2024 08:21:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F67B385E827 for ; Wed, 24 Jul 2024 22:21:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id DC445385DDCE for ; Wed, 24 Jul 2024 22:18:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC445385DDCE 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 DC445385DDCE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721859539; cv=none; b=xT+jkMsbQq5nHHg3ERKCKlx61IcTN/xZ5Xzu8Gd8Hl4Iq01+lvj0KqRf6CEn2FEFxDLz4me/o0Nvn8kuQ7xCtA76ab9udnxes0FowQ3E6GfwNAoolfXOlzevteMxSBSL6EwNgkh5ZTzHJYpANkiq+jcCfYBOSF6IT6xit8jA2UA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721859539; c=relaxed/simple; bh=E64S6ske+XAgR6wETVcvVuhch9Fh8E6n8SoO0spzbvI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=YP4QlHyGy788sQBKgYKZ4DCJRC/RLVyogddndt2ZAMOvbP19larJXpRNRPTZWMO3zpn4qQgT+ae9xJG741Nj3frp09staGjN7ZQUSGWjb5a3/c5pfhSEoVHTViw5YzAwx8ZD7SoFk9ZaNeck5SK2I8FI8x+03RdLpSCPU2W+Bp4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721859537; 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=qzD0Ty4/o2bcCZ4djr2pVpEle92km/K5m9zQq3n3ato=; b=Ow7kiPl52MJC28aqa3LFHt1LPQqX/h8yp6QADKXC2j4zyZYSAdCLzM4sjqYzvakrhviGOy ZsKDbw1XVjQzXvtg/1AtIjyICdcLWojjQxGDu1l78qdc13uCJlYLtSVbcX7O2cSWXryWVE /v84MlMW02i6Akgk84ELTyUOA1fFhxU= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-5RhZhZarPYKYoxCCfrhwYg-1; Wed, 24 Jul 2024 18:18:56 -0400 X-MC-Unique: 5RhZhZarPYKYoxCCfrhwYg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9436119560BA for ; Wed, 24 Jul 2024 22:18:55 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.33.183]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 90C051955F40; Wed, 24 Jul 2024 22:18:54 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 13/16] =?utf-8?b?ZGlhZ25vc3RpY3M6IFNBUklGIG91dHB1dDogYWRk?= =?utf-8?b?ICJ7c3RhcnQsIGVuZH1UaW1lVXRjIiBwcm9wZXJ0aWVzICjCp8KnMy4yMC43LTgp?= Date: Wed, 24 Jul 2024 18:18:21 -0400 Message-Id: <20240724221824.585054-14-dmalcolm@redhat.com> In-Reply-To: <20240724221824.585054-1-dmalcolm@redhat.com> References: <20240724221824.585054-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/ChangeLog: * diagnostic-format-sarif.cc (make_date_time_string_for_current_time): New. (sarif_invocation::sarif_invocation): Set "startTimeUtc" property (§3.20.7). (sarif_invocation::prepare_to_flush): Set "endTimeUtc" property (§3.20.8). gcc/testsuite/ChangeLog: * c-c++-common/diagnostic-format-sarif-file-1.c: Verify that we have "startTimeUtc" and "endTimeUtc" properties of the correct form. Signed-off-by: David Malcolm --- gcc/diagnostic-format-sarif.cc | 28 +++++++++++++++++++ .../diagnostic-format-sarif-file-1.c | 5 ++++ 2 files changed, 33 insertions(+) diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc index 6c7216651627..775d01f75744 100644 --- a/gcc/diagnostic-format-sarif.cc +++ b/gcc/diagnostic-format-sarif.cc @@ -119,6 +119,26 @@ class sarif_tool : public sarif_object {}; class sarif_tool_component : public sarif_object {}; +/* Make a JSON string for the current date and time. + See SARIF v2.1.0 section 3.9 "Date/time properties". + Given that we don't run at the very beginning/end of the + process, it doesn't make sense to be more accurate than + the current second. */ + +static std::unique_ptr +make_date_time_string_for_current_time () +{ + time_t t = time (nullptr); + struct tm *tm = gmtime (&t); + char buf[256]; + snprintf (buf, sizeof (buf) - 1, + ("%04i-%02i-%02iT" + "%02i:%02i:%02iZ"), + tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); + return ::make_unique (buf); +} + /* Subclass of sarif_object for SARIF "invocation" objects (SARIF v2.1.0 section 3.20). */ @@ -530,6 +550,10 @@ sarif_invocation::sarif_invocation (sarif_builder &builder, if (const char *pwd = getpwd ()) set ("workingDirectory", builder.make_artifact_location_object (pwd)); + + // "startTimeUtc" property (SARIF v2.1.0 section 3.20.7) + set ("startTimeUtc", + make_date_time_string_for_current_time ()); } /* Handle an internal compiler error DIAGNOSTIC occurring on CONTEXT. @@ -559,6 +583,10 @@ sarif_invocation::prepare_to_flush (diagnostic_context &context) this object (SARIF v2.1.0 section 3.8) e.g. for recording time vars. */ if (auto client_data_hooks = context.get_client_data_hooks ()) client_data_hooks->add_sarif_invocation_properties (*this); + + // "endTimeUtc" property (SARIF v2.1.0 section 3.20.8); + set ("endTimeUtc", + make_date_time_string_for_current_time ()); } /* class sarif_artifact : public sarif_object. */ diff --git a/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c b/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c index c9ad0d238195..fdf602eaae7b 100644 --- a/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c +++ b/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c @@ -37,6 +37,11 @@ 3.20.2 invocation "arguments" property: { dg-final { scan-sarif-file {"arguments": \[} } } + Expect "startTimeUtc" and "endTimeUtc" properties of the form + "nnnn-nn-nnTnn:nn:nnZ" (3.20.7 and 3.20.8): + { dg-final { scan-sarif-file {"startTimeUtc": "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]Z"} } } + { dg-final { scan-sarif-file {"endTimeUtc": "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]Z"} } } + { dg-final { scan-sarif-file {"workingDirectory": } } } { dg-final { scan-sarif-file "\"toolExecutionNotifications\": \\\[\\\]" } } { dg-final { scan-sarif-file "\"executionSuccessful\": true" } }