7812c78c34
2009-04-05 Daniel Kraft <d@domob.eu> PR fortran/38654 * io/read.c (read_f): Reworked to speed up floating point parsing. (convert_real): Use pointer-casting instead of memcpy and temporaries. 2009-04-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/37754 * io/io.h (format_hash_entry): New structure for hash table. (format_hash_table): The hash table itself. (free_format_data): Revise function prototype. (free_format_hash_table, init_format_hash, free_format_hash): New function prototypes. * io/unit.c (close_unit_1): Use free_format_hash_table. * io/transfer.c (st_read_done, st_write_done): Free format data if internal unit. * io/format.c (free_format_hash_table): New function that frees any memory allocated previously for cached format data. (reset_node): New static helper function to reset the format counters for a format node. (reset_fnode_counters): New static function recursively calls reset_node to traverse the fnode tree. (format_hash): New simple hash function based on XOR, probabalistic, tosses collisions. (save_parsed_format): New static function to save the parsed format data to use again. (find_parsed_format): New static function searches the hash table looking for a match. (free_format_data): Revised to accept pointer to format data rather than the dtp pointer so that the function can be used in more places. (format_lex): Editorial. (parse_format_list): Set flag used to determine of format data hashing is to be used. Internal units are not persistent enough for this. (revert): Move to ne location in file. (parse_format): Use new functions to look for previously parsed format strings and use them rather than re-parse. If not found, saves the parsed format data for later use. 2009-04-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/37754 * io/transfer.c (formatted_transfer_scalar): Remove this function by factoring it into two new functions, one for read and one for write, eliminating all the conditionals for read or write mode. (formatted transfer_scalar_read): New function. (formatted transfer_scalar_write): New function. (formatted_transfer): Use new functions. 2009-04-05 Janne Blomqvist <jb@gcc.gnu.org> PR libfortran/25561 libfortran/37754 * io/io.h (struct stream): Define new stream interface function pointers, and inline functions for accessing it. (struct fbuf): Use int instead of size_t, remove flushed element. (mem_alloc_w): New prototype. (mem_alloc_r): New prototype. (stream_at_bof): Remove prototype. (stream_at_eof): Remove prototype. (file_position): Remove prototype. (flush): Remove prototype. (stream_offset): Remove prototype. (unit_truncate): New prototype. (read_block_form): Change to return pointer, int* argument. (hit_eof): New prototype. (fbuf_init): Change prototype. (fbuf_reset): Change prototype. (fbuf_alloc): Change prototype. (fbuf_flush): Change prototype. (fbuf_seek): Change prototype. (fbuf_read): New prototype. (fbuf_getc_refill): New prototype. (fbuf_getc): New inline function. * io/fbuf.c (fbuf_init): Use int, get rid of flushed. (fbuf_debug): New function. (fbuf_reset): Flush, and return position offset. (fbuf_alloc): Simplify, don't flush, just realloc. (fbuf_flush): Make usable for read mode, salvage remaining bytes. (fbuf_seek): New whence argument. (fbuf_read): New function. (fbuf_getc_refill): New function. * io/file_pos.c (formatted_backspace): Use new stream interface. (unformatted_backspace): Likewise. (st_backspace): Make sure format buffer is reset, use new stream interface, use unit_truncate. (st_endfile): Likewise. (st_rewind): Likewise. * io/intrinsics.c: Use new stream interface. * io/list_read.c (push_char): Don't use u.p.scratch, use realloc to resize. (free_saved): Don't check u.p.scratch. (next_char): Use new stream interface, use fbuf_getc() for external files. (finish_list_read): flush format buffer. (nml_query): Update to use modified interface:s * io/open.c (test_endfile): Use new stream interface. (edit_modes): Likewise. (new_unit): Likewise, set bytes_left to 1 for stream files. * io/read.c (read_l): Use new read_block_form interface. (read_utf8): Likewise. (read_utf8_char1): Likewise. (read_default_char1): Likewise. (read_utf8_char4): Likewise. (read_default_char4): Likewise. (read_a): Likewise. (read_a_char4): Likewise. (read_decimal): Likewise. (read_radix): Likewise. (read_f): Likewise. * io/transfer.c (read_sf): Use fbuf_read and mem_alloc_r, remove usage of u.p.line_buffer. (read_block_form): Update interface to return pointer, use fbuf_read for direct access. (read_block_direct): Update to new stream interface. (write_block): Use mem_alloc_w for internal I/O. (write_buf): Update to new stream interface. (formatted_transfer_scalar): Don't use u.p.line_buffer, use fbuf_seek for external files. (us_read): Update to new stream interface. (us_write): Likewise. (data_transfer_init): Always check if we switch modes and flush. (skip_record): Use new stream interface, fix comparison. (next_record_r): Check for and reset u.p.at_eof, use new stream interface, use fbuf_getc for spacing. (write_us_marker): Update to new stream interface, don't inline. (next_record_w_unf): Likewise. (sset): New function. (next_record_w): Use new stream interface, use fbuf for printing newline. (next_record): Use new stream interface. (finalize_transfer): Remove sfree call, use new stream interface. (st_iolength_done): Don't use u.p.scratch. (st_read): Don't check for end of file. (st_read_done): Don't use u.p.scratch, use unit_truncate. (hit_eof): New function. * io/unit.c (init_units): Always init fbuf for formatted units. (update_position): Use new stream interface. (unit_truncate): New function. (finish_last_advance_record): Use fbuf to print newline. * io/unix.c: Remove unused SSIZE_MAX macro. (BUFFER_SIZE): Make static const variable rather than macro. (struct unix_stream): Remove dirty_offset, len, method, small_buffer. Order elements by decreasing size. (struct int_stream): Remove. (move_pos_offset): Remove usage of dirty_offset. (reset_stream): Remove. (do_read): Rename to raw_read, update to match new stream interface. (do_write): Rename to raw_write, update to new stream interface. (raw_seek): New function. (raw_tell): New function. (raw_truncate): New function. (raw_close): New function. (raw_flush): New function. (raw_init): New function. (fd_alloc): Remove. (fd_alloc_r_at): Remove. (fd_alloc_w_at): Remove. (fd_sfree): Remove. (fd_seek): Remove. (fd_truncate): Remove. (fd_sset): Remove. (fd_read): Remove. (fd_write): Remove. (fd_close): Remove. (fd_open): Remove. (fd_flush): Rename to buf_flush, update to new stream interface and unix_stream. (buf_read): New function. (buf_write): New function. (buf_seek): New function. (buf_tell): New function. (buf_truncate): New function. (buf_close): New function. (buf_init): New function. (mem_alloc_r_at): Rename to mem_alloc_r, change prototype. (mem_alloc_w_at): Rename to mem_alloc_w, change prototype. (mem_read): Change to match new stream interface. (mem_write): Likewise. (mem_seek): Likewise. (mem_tell): Likewise. (mem_truncate): Likewise. (mem_close): Likewise. (mem_flush): New function. (mem_sfree): Remove. (empty_internal_buffer): Cast to correct type. (open_internal): Use correct type, init function pointers. (fd_to_stream): Test whether to open file as buffered or raw. (output_stream): Remove mode set. (error_stream): Likewise. (flush_all_units_1): Use new stream interface. (flush_all_units): Likewise. (stream_at_bof): Remove. (stream_at_eof): Remove. (file_position): Remove. (file_length): Update logic to use stream interface. (flush): Remove. (stream_offset): Remove. * io/write.c (write_utf8_char4): Use int instead of size_t. (write_x): Extra safety check. (namelist_write_newline): Use new stream interface. From-SVN: r145571
428 lines
10 KiB
C
428 lines
10 KiB
C
/* Copyright (C) 2002-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
|
|
Contributed by Andy Vaught and Janne Blomqvist
|
|
|
|
This file is part of the GNU Fortran runtime library (libgfortran).
|
|
|
|
Libgfortran is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combine
|
|
executable.)
|
|
|
|
Libgfortran is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with Libgfortran; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "io.h"
|
|
#include <string.h>
|
|
|
|
/* file_pos.c-- Implement the file positioning statements, i.e. BACKSPACE,
|
|
ENDFILE, and REWIND as well as the FLUSH statement. */
|
|
|
|
|
|
/* formatted_backspace(fpp, u)-- Move the file back one line. The
|
|
current position is after the newline that terminates the previous
|
|
record, and we have to sift backwards to find the newline before
|
|
that or the start of the file, whichever comes first. */
|
|
|
|
static const int READ_CHUNK = 4096;
|
|
|
|
static void
|
|
formatted_backspace (st_parameter_filepos *fpp, gfc_unit *u)
|
|
{
|
|
gfc_offset base;
|
|
char p[READ_CHUNK];
|
|
ssize_t n;
|
|
|
|
base = stell (u->s) - 1;
|
|
|
|
do
|
|
{
|
|
n = (base < READ_CHUNK) ? base : READ_CHUNK;
|
|
base -= n;
|
|
if (sseek (u->s, base, SEEK_SET) < 0)
|
|
goto io_error;
|
|
if (sread (u->s, p, n) != n)
|
|
goto io_error;
|
|
|
|
/* We have moved backwards from the current position, it should
|
|
not be possible to get a short read. Because it is not
|
|
clear what to do about such thing, we ignore the possibility. */
|
|
|
|
/* There is no memrchr() in the C library, so we have to do it
|
|
ourselves. */
|
|
|
|
while (n > 0)
|
|
{
|
|
n--;
|
|
if (p[n] == '\n')
|
|
{
|
|
base += n + 1;
|
|
goto done;
|
|
}
|
|
}
|
|
|
|
}
|
|
while (base != 0);
|
|
|
|
/* base is the new pointer. Seek to it exactly. */
|
|
done:
|
|
if (sseek (u->s, base, SEEK_SET) < 0)
|
|
goto io_error;
|
|
u->last_record--;
|
|
u->endfile = NO_ENDFILE;
|
|
|
|
return;
|
|
|
|
io_error:
|
|
generate_error (&fpp->common, LIBERROR_OS, NULL);
|
|
}
|
|
|
|
|
|
/* unformatted_backspace(fpp) -- Move the file backwards for an unformatted
|
|
sequential file. We are guaranteed to be between records on entry and
|
|
we have to shift to the previous record. Loop over subrecords. */
|
|
|
|
static void
|
|
unformatted_backspace (st_parameter_filepos *fpp, gfc_unit *u)
|
|
{
|
|
gfc_offset m, slen;
|
|
GFC_INTEGER_4 m4;
|
|
GFC_INTEGER_8 m8;
|
|
ssize_t length;
|
|
int continued;
|
|
char p[sizeof (GFC_INTEGER_8)];
|
|
|
|
if (compile_options.record_marker == 0)
|
|
length = sizeof (GFC_INTEGER_4);
|
|
else
|
|
length = compile_options.record_marker;
|
|
|
|
do
|
|
{
|
|
slen = - (gfc_offset) length;
|
|
if (sseek (u->s, slen, SEEK_CUR) < 0)
|
|
goto io_error;
|
|
if (sread (u->s, p, length) != length)
|
|
goto io_error;
|
|
|
|
/* Only GFC_CONVERT_NATIVE and GFC_CONVERT_SWAP are valid here. */
|
|
if (likely (u->flags.convert == GFC_CONVERT_NATIVE))
|
|
{
|
|
switch (length)
|
|
{
|
|
case sizeof(GFC_INTEGER_4):
|
|
memcpy (&m4, p, sizeof (m4));
|
|
m = m4;
|
|
break;
|
|
|
|
case sizeof(GFC_INTEGER_8):
|
|
memcpy (&m8, p, sizeof (m8));
|
|
m = m8;
|
|
break;
|
|
|
|
default:
|
|
runtime_error ("Illegal value for record marker");
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
switch (length)
|
|
{
|
|
case sizeof(GFC_INTEGER_4):
|
|
reverse_memcpy (&m4, p, sizeof (m4));
|
|
m = m4;
|
|
break;
|
|
|
|
case sizeof(GFC_INTEGER_8):
|
|
reverse_memcpy (&m8, p, sizeof (m8));
|
|
m = m8;
|
|
break;
|
|
|
|
default:
|
|
runtime_error ("Illegal value for record marker");
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
continued = m < 0;
|
|
if (continued)
|
|
m = -m;
|
|
|
|
if (sseek (u->s, -m -2 * length, SEEK_CUR) < 0)
|
|
goto io_error;
|
|
} while (continued);
|
|
|
|
u->last_record--;
|
|
return;
|
|
|
|
io_error:
|
|
generate_error (&fpp->common, LIBERROR_OS, NULL);
|
|
}
|
|
|
|
|
|
extern void st_backspace (st_parameter_filepos *);
|
|
export_proto(st_backspace);
|
|
|
|
void
|
|
st_backspace (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u == NULL)
|
|
{
|
|
generate_error (&fpp->common, LIBERROR_BAD_UNIT, NULL);
|
|
goto done;
|
|
}
|
|
|
|
/* Direct access is prohibited, and so is unformatted stream access. */
|
|
|
|
|
|
if (u->flags.access == ACCESS_DIRECT)
|
|
{
|
|
generate_error (&fpp->common, LIBERROR_OPTION_CONFLICT,
|
|
"Cannot BACKSPACE a file opened for DIRECT access");
|
|
goto done;
|
|
}
|
|
|
|
if (u->flags.access == ACCESS_STREAM && u->flags.form == FORM_UNFORMATTED)
|
|
{
|
|
generate_error (&fpp->common, LIBERROR_OPTION_CONFLICT,
|
|
"Cannot BACKSPACE an unformatted stream file");
|
|
goto done;
|
|
}
|
|
|
|
/* Make sure format buffer is flushed and reset. */
|
|
if (u->flags.form == FORM_FORMATTED)
|
|
{
|
|
int pos = fbuf_reset (u);
|
|
if (pos != 0)
|
|
sseek (u->s, pos, SEEK_CUR);
|
|
}
|
|
|
|
|
|
/* Check for special cases involving the ENDFILE record first. */
|
|
|
|
if (u->endfile == AFTER_ENDFILE)
|
|
{
|
|
u->endfile = AT_ENDFILE;
|
|
u->flags.position = POSITION_APPEND;
|
|
sflush (u->s);
|
|
}
|
|
else
|
|
{
|
|
if (stell (u->s) == 0)
|
|
{
|
|
u->flags.position = POSITION_REWIND;
|
|
goto done; /* Common special case */
|
|
}
|
|
|
|
if (u->mode == WRITING)
|
|
{
|
|
/* If there are previously written bytes from a write with
|
|
ADVANCE="no", add a record marker before performing the
|
|
BACKSPACE. */
|
|
|
|
if (u->previous_nonadvancing_write)
|
|
finish_last_advance_record (u);
|
|
|
|
u->previous_nonadvancing_write = 0;
|
|
|
|
unit_truncate (u, stell (u->s), &fpp->common);
|
|
u->mode = READING;
|
|
}
|
|
|
|
if (u->flags.form == FORM_FORMATTED)
|
|
formatted_backspace (fpp, u);
|
|
else
|
|
unformatted_backspace (fpp, u);
|
|
|
|
u->flags.position = POSITION_UNSPECIFIED;
|
|
u->endfile = NO_ENDFILE;
|
|
u->current_record = 0;
|
|
u->bytes_left = 0;
|
|
}
|
|
|
|
done:
|
|
if (u != NULL)
|
|
unlock_unit (u);
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_endfile (st_parameter_filepos *);
|
|
export_proto(st_endfile);
|
|
|
|
void
|
|
st_endfile (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
if (u->flags.access == ACCESS_DIRECT)
|
|
{
|
|
generate_error (&fpp->common, LIBERROR_OPTION_CONFLICT,
|
|
"Cannot perform ENDFILE on a file opened"
|
|
" for DIRECT access");
|
|
goto done;
|
|
}
|
|
|
|
/* If there are previously written bytes from a write with ADVANCE="no",
|
|
add a record marker before performing the ENDFILE. */
|
|
|
|
if (u->previous_nonadvancing_write)
|
|
finish_last_advance_record (u);
|
|
|
|
u->previous_nonadvancing_write = 0;
|
|
|
|
if (u->current_record)
|
|
{
|
|
st_parameter_dt dtp;
|
|
dtp.common = fpp->common;
|
|
memset (&dtp.u.p, 0, sizeof (dtp.u.p));
|
|
dtp.u.p.current_unit = u;
|
|
next_record (&dtp, 1);
|
|
}
|
|
|
|
unit_truncate (u, stell (u->s), &fpp->common);
|
|
u->endfile = AFTER_ENDFILE;
|
|
if (0 == stell (u->s))
|
|
u->flags.position = POSITION_REWIND;
|
|
done:
|
|
unlock_unit (u);
|
|
}
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_rewind (st_parameter_filepos *);
|
|
export_proto(st_rewind);
|
|
|
|
void
|
|
st_rewind (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
if (u->flags.access == ACCESS_DIRECT)
|
|
generate_error (&fpp->common, LIBERROR_BAD_OPTION,
|
|
"Cannot REWIND a file opened for DIRECT access");
|
|
else
|
|
{
|
|
/* If there are previously written bytes from a write with ADVANCE="no",
|
|
add a record marker before performing the ENDFILE. */
|
|
|
|
if (u->previous_nonadvancing_write)
|
|
finish_last_advance_record (u);
|
|
|
|
u->previous_nonadvancing_write = 0;
|
|
|
|
/* Flush the buffers. If we have been writing to the file, the last
|
|
written record is the last record in the file, so truncate the
|
|
file now. Reset to read mode so two consecutive rewind
|
|
statements do not delete the file contents. */
|
|
if (u->mode == WRITING)
|
|
{
|
|
/* unit_truncate takes care of flushing. */
|
|
unit_truncate (u, stell (u->s), &fpp->common);
|
|
/* .. but we still need to reset since we're going to seek. */
|
|
fbuf_reset (u);
|
|
}
|
|
else
|
|
{
|
|
/* Make sure buffers are reset. */
|
|
if (u->flags.form == FORM_FORMATTED)
|
|
fbuf_reset (u);
|
|
sflush (u->s);
|
|
}
|
|
|
|
u->mode = READING;
|
|
u->last_record = 0;
|
|
|
|
if (sseek (u->s, 0, SEEK_SET) < 0)
|
|
generate_error (&fpp->common, LIBERROR_OS, NULL);
|
|
|
|
/* Handle special files like /dev/null differently. */
|
|
if (!is_special (u->s))
|
|
{
|
|
/* We are rewinding so we are not at the end. */
|
|
u->endfile = NO_ENDFILE;
|
|
}
|
|
else
|
|
{
|
|
/* Set this for compatibilty with g77 for /dev/null. */
|
|
if (file_length (u->s) == 0 && stell (u->s) == 0)
|
|
u->endfile = AT_ENDFILE;
|
|
/* Future refinements on special files can go here. */
|
|
}
|
|
|
|
u->current_record = 0;
|
|
u->strm_pos = 1;
|
|
u->read_bad = 0;
|
|
}
|
|
/* Update position for INQUIRE. */
|
|
u->flags.position = POSITION_REWIND;
|
|
unlock_unit (u);
|
|
}
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_flush (st_parameter_filepos *);
|
|
export_proto(st_flush);
|
|
|
|
void
|
|
st_flush (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
/* Make sure format buffer is flushed. */
|
|
if (u->flags.form == FORM_FORMATTED)
|
|
fbuf_flush (u, u->mode);
|
|
|
|
sflush (u->s);
|
|
unlock_unit (u);
|
|
}
|
|
else
|
|
/* FLUSH on unconnected unit is illegal: F95 std., 9.3.5. */
|
|
generate_error (&fpp->common, LIBERROR_BAD_OPTION,
|
|
"Specified UNIT in FLUSH is not connected");
|
|
|
|
library_end ();
|
|
}
|