diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2013-04-29 11:42:00 +0300 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2013-04-29 11:42:00 +0300 |
| commit | c033f5ae3270e34c40c7ef9e7168b9884e39b75a (patch) | |
| tree | 3b1ca6b7cea4c26f9fb00330df1afd202ff6a6cb /libgfortran/io/transfer.c | |
| parent | 94dc53320e6c22ef0d3f8d8db83c2492de001f5b (diff) | |
| download | gcc-c033f5ae3270e34c40c7ef9e7168b9884e39b75a.zip gcc-c033f5ae3270e34c40c7ef9e7168b9884e39b75a.tar.gz gcc-c033f5ae3270e34c40c7ef9e7168b9884e39b75a.tar.bz2 | |
PR 56981 Improve unbuffered performance on special files.
2013-04-29 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/56981
* io/transfer.c (next_record_w_unf): First fix head marker, then
write tail.
(next_record): Call flush_if_unbuffered.
* io/unix.c (struct unix_stream): Add field unbuffered.
(flush_if_unbuffered): New function.
(fd_to_stream): New argument.
(open_external): Fix fd_to_stream call.
(input_stream): Likewise.
(output_stream): Likewise.
(error_stream): Likewise.
* io/unix.h (flush_if_unbuffered): New prototype.
From-SVN: r198390
Diffstat (limited to 'libgfortran/io/transfer.c')
| -rw-r--r-- | libgfortran/io/transfer.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index bb93009..52b1da6 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -3207,17 +3207,6 @@ next_record_w_unf (st_parameter_dt *dtp, int next_subrecord) m = dtp->u.p.current_unit->recl_subrecord - dtp->u.p.current_unit->bytes_left_subrecord; - /* Write the length tail. If we finish a record containing - subrecords, we write out the negative length. */ - - if (dtp->u.p.current_unit->continued) - m_write = -m; - else - m_write = m; - - if (unlikely (write_us_marker (dtp, m_write) < 0)) - goto io_error; - if (compile_options.record_marker == 0) record_marker = sizeof (GFC_INTEGER_4); else @@ -3226,7 +3215,7 @@ next_record_w_unf (st_parameter_dt *dtp, int next_subrecord) /* Seek to the head and overwrite the bogus length with the real length. */ - if (unlikely (sseek (dtp->u.p.current_unit->s, - m - 2 * record_marker, + if (unlikely (sseek (dtp->u.p.current_unit->s, - m - record_marker, SEEK_CUR) < 0)) goto io_error; @@ -3240,8 +3229,18 @@ next_record_w_unf (st_parameter_dt *dtp, int next_subrecord) /* Seek past the end of the current record. */ - if (unlikely (sseek (dtp->u.p.current_unit->s, m + record_marker, - SEEK_CUR) < 0)) + if (unlikely (sseek (dtp->u.p.current_unit->s, m, SEEK_CUR) < 0)) + goto io_error; + + /* Write the length tail. If we finish a record containing + subrecords, we write out the negative length. */ + + if (dtp->u.p.current_unit->continued) + m_write = -m; + else + m_write = m; + + if (unlikely (write_us_marker (dtp, m_write) < 0)) goto io_error; return; @@ -3503,6 +3502,7 @@ next_record (st_parameter_dt *dtp, int done) pre_position (dtp); fbuf_flush (dtp->u.p.current_unit, dtp->u.p.mode); + flush_if_unbuffered (dtp->u.p.current_unit->s); } |