From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: gcc-patches@gcc.gnu.org
Subject: [RFC/gcov 11/12] gcov: Record EOF error during read
Date: Thu, 31 Mar 2022 13:35:14 +0200 [thread overview]
Message-ID: <20220331113515.35764-12-sebastian.huber@embedded-brains.de> (raw)
In-Reply-To: <20220331113515.35764-1-sebastian.huber@embedded-brains.de>
Use an enum for file error codes.
gcc/
* gcov-io.cc (gcov_file_error): New enum.
(gcov_var): Use gcov_file_error enum for the error member.
(gcov_open): Use GCOV_FILE_NO_ERROR.
(gcov_close): Use GCOV_FILE_WRITE_ERROR.
(gcov_write): Likewise.
(gcov_write_unsigned): Likewise.
(gcov_write_string): Likewise.
(gcov_read_bytes): Set error code if EOF is reached.
(gcov_read_counter): Use GCOV_FILE_COUNTER_OVERFLOW.
---
gcc/gcov-io.cc | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/gcc/gcov-io.cc b/gcc/gcov-io.cc
index 177f81166a6..60c762bf3a3 100644
--- a/gcc/gcov-io.cc
+++ b/gcc/gcov-io.cc
@@ -29,10 +29,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
static gcov_unsigned_t *gcov_read_words (void *buffer, unsigned);
+enum gcov_file_error {
+ GCOV_FILE_COUNTER_OVERFLOW = -1,
+ GCOV_FILE_NO_ERROR = 0,
+ GCOV_FILE_WRITE_ERROR = 1,
+ GCOV_FILE_EOF = 2
+};
+
struct gcov_var
{
FILE *file;
- int error; /* < 0 overflow, > 0 disk error. */
+ enum gcov_file_error error;
int mode; /* < 0 writing, > 0 reading. */
int endian; /* Swap endianness. */
#ifdef IN_GCOV_TOOL
@@ -113,7 +120,7 @@ gcov_open (const char *name, int mode)
#endif
gcov_nonruntime_assert (!gcov_var.file);
- gcov_var.error = 0;
+ gcov_var.error = GCOV_FILE_NO_ERROR;
#if !IN_LIBGCOV || defined (IN_GCOV_TOOL)
gcov_var.endian = 0;
#endif
@@ -217,7 +224,7 @@ gcov_close (void)
if (gcov_var.file)
{
if (fclose (gcov_var.file))
- gcov_var.error = 1;
+ gcov_var.error = GCOV_FILE_WRITE_ERROR;
gcov_var.file = 0;
}
@@ -253,7 +260,7 @@ gcov_write (const void *data, unsigned length)
{
gcov_unsigned_t r = fwrite (data, length, 1, gcov_var.file);
if (r != 1)
- gcov_var.error = 1;
+ gcov_var.error = GCOV_FILE_WRITE_ERROR;
}
/* Write unsigned VALUE to coverage file. */
@@ -263,7 +270,7 @@ gcov_write_unsigned (gcov_unsigned_t value)
{
gcov_unsigned_t r = fwrite (&value, sizeof (value), 1, gcov_var.file);
if (r != 1)
- gcov_var.error = 1;
+ gcov_var.error = GCOV_FILE_WRITE_ERROR;
}
#if !IN_LIBGCOV
@@ -283,7 +290,7 @@ gcov_write_string (const char *string)
{
gcov_unsigned_t r = fwrite (string, length, 1, gcov_var.file);
if (r != 1)
- gcov_var.error = 1;
+ gcov_var.error = GCOV_FILE_WRITE_ERROR;
}
}
#endif
@@ -385,7 +392,11 @@ gcov_read_bytes (void *buffer, unsigned count)
unsigned read = fread (buffer, count, 1, gcov_var.file);
if (read != 1)
- return NULL;
+ {
+ if (feof (gcov_var.file))
+ gcov_var.error = GCOV_FILE_EOF;
+ return NULL;
+ }
#ifdef IN_GCOV_TOOL
gcov_var.pos += count;
@@ -434,7 +445,7 @@ gcov_read_counter (void)
if (sizeof (value) > sizeof (gcov_unsigned_t))
value |= ((gcov_type) from_file (buffer[1])) << 32;
else if (buffer[1])
- gcov_var.error = -1;
+ gcov_var.error = GCOV_FILE_COUNTER_OVERFLOW;
return value;
}
--
2.34.1
next prev parent reply other threads:[~2022-03-31 11:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 11:35 [RFC/gcov 00/12] Add merge-stream subcommand to gcov-tool Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 01/12] gcov-tool: Allow merging of empty profile lists Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 02/12] gcov: Add mode to all gcov_open() Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 03/12] gcov: Add open mode parameter to gcov_do_dump() Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 04/12] gcov: Make gcov_seek() static Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 05/12] gcov: Add __gcov_filename_to_gcfn() Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 06/12] gcov-tool: Support file input from stdin Sebastian Huber
2022-04-07 8:32 ` Martin Liška
2022-03-31 11:35 ` [RFC/gcov 07/12] gcov: Use xstrdup() Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 08/12] gcov: Move prepend to list to read_gcda_file() Sebastian Huber
2022-04-07 8:33 ` Martin Liška
2022-03-31 11:35 ` [RFC/gcov 09/12] gcov: Move gcov_open() to caller of read_gcda_file() Sebastian Huber
2022-03-31 11:35 ` [RFC/gcov 10/12] gcov: Fix integer types in ftw_read_file() Sebastian Huber
2022-03-31 11:35 ` Sebastian Huber [this message]
2022-04-07 8:34 ` [RFC/gcov 11/12] gcov: Record EOF error during read Martin Liška
2022-03-31 11:35 ` [RFC/gcov 12/12] gcov-tool: Add merge-stream subcommand Sebastian Huber
2022-04-07 8:36 ` Martin Liška
2022-04-07 8:38 ` [RFC/gcov 00/12] Add merge-stream subcommand to gcov-tool Martin Liška
2022-04-07 9:05 ` Sebastian Huber
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=20220331113515.35764-12-sebastian.huber@embedded-brains.de \
--to=sebastian.huber@embedded-brains.de \
--cc=gcc-patches@gcc.gnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).