From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id BDE453858C50 for ; Thu, 7 Apr 2022 08:32:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BDE453858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 679F61F85A; Thu, 7 Apr 2022 08:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1649320337; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wrLgyWfYHjvt6kWvpPL91KKMjKaZlCQCJ/vwLXPnRa4=; b=UxP5w692POlhA1D1j1vKBXZTTh4Pg2pLs7fgOg2SFRk4PeA/GLStQUEA1DDUIR1lHArnYR pwbLvrcXoLUqbdWqMSB8VktSXPQRvgMDco5TlqwngjCiTDSYPEdZWBCVyRwYi/Vqz+X5m0 Ll5IgyyEMW1oCedUtGNhNbjdEsIcxIM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1649320337; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wrLgyWfYHjvt6kWvpPL91KKMjKaZlCQCJ/vwLXPnRa4=; b=PAULzLCw+Jd8I8PenDVC3gebldlrwLtLtpvLhJ7kdgWzByyssFHzj4rdYS+RZbvwu8AJCJ qESq5GkAXvqi+gAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3DA6913485; Thu, 7 Apr 2022 08:32:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Rx/XDZGhTmKMDwAAMHmgww (envelope-from ); Thu, 07 Apr 2022 08:32:17 +0000 Message-ID: <5064695f-05c9-b1cf-531a-90b01b8b6fd6@suse.cz> Date: Thu, 7 Apr 2022 10:32:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [RFC/gcov 06/12] gcov-tool: Support file input from stdin Content-Language: en-US To: Sebastian Huber , gcc-patches@gcc.gnu.org References: <20220331113515.35764-1-sebastian.huber@embedded-brains.de> <20220331113515.35764-7-sebastian.huber@embedded-brains.de> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: <20220331113515.35764-7-sebastian.huber@embedded-brains.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2022 08:32:20 -0000 On 3/31/22 13:35, Sebastian Huber wrote: > gcc/ > > * gcov-io.cc (GCOV_MODE_STDIN): Define. > (gcov_position): For gcov-tool, return calculated position if file is > stdin. > (gcov_open): For gcov-tool, use stdin if filename is NULL. > (gcov_close): For gcov-tool, do not close stdin. > (gcov_read_bytes): For gcov-tool, update position if file is stdin. > (gcov_sync): For gcov-tool, discard input if file is stdin. > --- > gcc/gcov-io.cc | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/gcc/gcov-io.cc b/gcc/gcov-io.cc > index fee3130f94a..177f81166a6 100644 > --- a/gcc/gcov-io.cc > +++ b/gcc/gcov-io.cc > @@ -35,8 +35,13 @@ struct gcov_var > int error; /* < 0 overflow, > 0 disk error. */ > int mode; /* < 0 writing, > 0 reading. */ > int endian; /* Swap endianness. */ > +#ifdef IN_GCOV_TOOL > + gcov_position_t pos; /* File position for stdin support. */ One more space after dot. > +#endif > } gcov_var; > > +#define GCOV_MODE_STDIN 2 > + > /* Save the current position in the gcov file. */ > /* We need to expose this function when compiling for gcov-tool. */ > #ifndef IN_GCOV_TOOL > @@ -45,6 +50,10 @@ static inline > gcov_position_t > gcov_position (void) > { > +#ifdef IN_GCOV_TOOL > + if (gcov_var.mode == GCOV_MODE_STDIN) > + return gcov_var.pos; > +#endif > return ftell (gcov_var.file); > } > > @@ -108,6 +117,16 @@ gcov_open (const char *name, int mode) > #if !IN_LIBGCOV || defined (IN_GCOV_TOOL) > gcov_var.endian = 0; > #endif > +#ifdef IN_GCOV_TOOL > + gcov_var.pos = 0; > + if (!name) > + { > + gcov_nonruntime_assert (gcov_var.mode > 0); > + gcov_var.file = stdin; > + gcov_var.mode = GCOV_MODE_STDIN; > + return 1; > + } > +#endif > #if GCOV_LOCKED > if (mode > 0) > { > @@ -190,6 +209,11 @@ gcov_open (const char *name, int mode) > GCOV_LINKAGE int > gcov_close (void) > { > +#ifdef IN_GCOV_TOOL > + if (gcov_var.file == stdin) > + gcov_var.file = 0; > + else > +#endif > if (gcov_var.file) > { > if (fclose (gcov_var.file)) > @@ -363,6 +387,9 @@ gcov_read_bytes (void *buffer, unsigned count) > if (read != 1) > return NULL; > > +#ifdef IN_GCOV_TOOL > + gcov_var.pos += count; > +#endif > return buffer; > } > > @@ -499,6 +526,17 @@ gcov_sync (gcov_position_t base, gcov_unsigned_t length) > { > gcov_nonruntime_assert (gcov_var.mode > 0); > base += length; > +#ifdef IN_GCOV_TOOL > + if (gcov_var.mode == GCOV_MODE_STDIN) > + { > + while (gcov_var.pos < base) > + { > + ++gcov_var.pos; > + (void)fgetc(gcov_var.file); A space after fgetc, please. Martin > + } > + return; > + } > +#endif > fseek (gcov_var.file, base, SEEK_SET); > } > #endif