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
274 lines
7.0 KiB
C
274 lines
7.0 KiB
C
/* Copyright (C) 2008 Free Software Foundation, Inc.
|
|
Contributed by 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>
|
|
#include <stdlib.h>
|
|
|
|
|
|
//#define FBUF_DEBUG
|
|
|
|
|
|
void
|
|
fbuf_init (gfc_unit * u, int len)
|
|
{
|
|
if (len == 0)
|
|
len = 512; /* Default size. */
|
|
|
|
u->fbuf = get_mem (sizeof (fbuf));
|
|
u->fbuf->buf = get_mem (len);
|
|
u->fbuf->len = len;
|
|
u->fbuf->act = u->fbuf->pos = 0;
|
|
}
|
|
|
|
|
|
void
|
|
fbuf_destroy (gfc_unit * u)
|
|
{
|
|
if (u->fbuf == NULL)
|
|
return;
|
|
if (u->fbuf->buf)
|
|
free_mem (u->fbuf->buf);
|
|
free_mem (u->fbuf);
|
|
u->fbuf = NULL;
|
|
}
|
|
|
|
|
|
static void
|
|
#ifdef FBUF_DEBUG
|
|
fbuf_debug (gfc_unit * u, const char * format, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, format);
|
|
vfprintf(stderr, format, args);
|
|
va_end(args);
|
|
fprintf (stderr, "fbuf_debug pos: %d, act: %d, buf: ''",
|
|
u->fbuf->pos, u->fbuf->act);
|
|
for (int ii = 0; ii < u->fbuf->act; ii++)
|
|
{
|
|
putc (u->fbuf->buf[ii], stderr);
|
|
}
|
|
fprintf (stderr, "''\n");
|
|
}
|
|
#else
|
|
fbuf_debug (gfc_unit * u __attribute__ ((unused)),
|
|
const char * format __attribute__ ((unused)),
|
|
...) {}
|
|
#endif
|
|
|
|
|
|
|
|
/* You should probably call this before doing a physical seek on the
|
|
underlying device. Returns how much the physical position was
|
|
modified. */
|
|
|
|
int
|
|
fbuf_reset (gfc_unit * u)
|
|
{
|
|
int seekval = 0;
|
|
|
|
if (!u->fbuf)
|
|
return 0;
|
|
|
|
fbuf_debug (u, "fbuf_reset: ");
|
|
fbuf_flush (u, u->mode);
|
|
/* If we read past the current position, seek the underlying device
|
|
back. */
|
|
if (u->mode == READING && u->fbuf->act > u->fbuf->pos)
|
|
{
|
|
seekval = - (u->fbuf->act - u->fbuf->pos);
|
|
fbuf_debug (u, "fbuf_reset seekval %d, ", seekval);
|
|
}
|
|
u->fbuf->act = u->fbuf->pos = 0;
|
|
return seekval;
|
|
}
|
|
|
|
|
|
/* Return a pointer to the current position in the buffer, and increase
|
|
the pointer by len. Makes sure that the buffer is big enough,
|
|
reallocating if necessary. */
|
|
|
|
char *
|
|
fbuf_alloc (gfc_unit * u, int len)
|
|
{
|
|
int newlen;
|
|
char *dest;
|
|
fbuf_debug (u, "fbuf_alloc len %d, ", len);
|
|
if (u->fbuf->pos + len > u->fbuf->len)
|
|
{
|
|
/* Round up to nearest multiple of the current buffer length. */
|
|
newlen = ((u->fbuf->pos + len) / u->fbuf->len + 1) * u->fbuf->len;
|
|
dest = realloc (u->fbuf->buf, newlen);
|
|
if (dest == NULL)
|
|
return NULL;
|
|
u->fbuf->buf = dest;
|
|
u->fbuf->len = newlen;
|
|
}
|
|
|
|
dest = u->fbuf->buf + u->fbuf->pos;
|
|
u->fbuf->pos += len;
|
|
if (u->fbuf->pos > u->fbuf->act)
|
|
u->fbuf->act = u->fbuf->pos;
|
|
return dest;
|
|
}
|
|
|
|
|
|
/* mode argument is WRITING for write mode and READING for read
|
|
mode. Return value is 0 for success, -1 on failure. */
|
|
|
|
int
|
|
fbuf_flush (gfc_unit * u, unit_mode mode)
|
|
{
|
|
int nwritten;
|
|
|
|
if (!u->fbuf)
|
|
return 0;
|
|
|
|
fbuf_debug (u, "fbuf_flush with mode %d: ", mode);
|
|
|
|
if (mode == WRITING)
|
|
{
|
|
if (u->fbuf->pos > 0)
|
|
{
|
|
nwritten = swrite (u->s, u->fbuf->buf, u->fbuf->pos);
|
|
if (nwritten < 0)
|
|
return -1;
|
|
}
|
|
}
|
|
/* Salvage remaining bytes for both reading and writing. This
|
|
happens with the combination of advance='no' and T edit
|
|
descriptors leaving the final position somewhere not at the end
|
|
of the record. For reading, this also happens if we sread() past
|
|
the record boundary. */
|
|
if (u->fbuf->act > u->fbuf->pos && u->fbuf->pos > 0)
|
|
memmove (u->fbuf->buf, u->fbuf->buf + u->fbuf->pos,
|
|
u->fbuf->act - u->fbuf->pos);
|
|
|
|
u->fbuf->act -= u->fbuf->pos;
|
|
u->fbuf->pos = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
fbuf_seek (gfc_unit * u, int off, int whence)
|
|
{
|
|
if (!u->fbuf)
|
|
return -1;
|
|
|
|
switch (whence)
|
|
{
|
|
case SEEK_SET:
|
|
break;
|
|
case SEEK_CUR:
|
|
off += u->fbuf->pos;
|
|
break;
|
|
case SEEK_END:
|
|
off += u->fbuf->act;
|
|
break;
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
fbuf_debug (u, "fbuf_seek, off %d ", off);
|
|
/* The start of the buffer is always equal to the left tab
|
|
limit. Moving to the left past the buffer is illegal in C and
|
|
would also imply moving past the left tab limit, which is never
|
|
allowed in Fortran. Similarly, seeking past the end of the buffer
|
|
is not possible, in that case the user must make sure to allocate
|
|
space with fbuf_alloc(). So return error if that is
|
|
attempted. */
|
|
if (off < 0 || off > u->fbuf->act)
|
|
return -1;
|
|
u->fbuf->pos = off;
|
|
return off;
|
|
}
|
|
|
|
|
|
/* Fill the buffer with bytes for reading. Returns a pointer to start
|
|
reading from. If we hit EOF, returns a short read count. If any
|
|
other error occurs, return NULL. After reading, the caller is
|
|
expected to call fbuf_seek to update the position with the number
|
|
of bytes actually processed. */
|
|
|
|
char *
|
|
fbuf_read (gfc_unit * u, int * len)
|
|
{
|
|
char *ptr;
|
|
int oldact, oldpos;
|
|
int readlen = 0;
|
|
|
|
fbuf_debug (u, "fbuf_read, len %d: ", *len);
|
|
oldact = u->fbuf->act;
|
|
oldpos = u->fbuf->pos;
|
|
ptr = fbuf_alloc (u, *len);
|
|
u->fbuf->pos = oldpos;
|
|
if (oldpos + *len > oldact)
|
|
{
|
|
fbuf_debug (u, "reading %d bytes starting at %d ",
|
|
oldpos + *len - oldact, oldact);
|
|
readlen = sread (u->s, u->fbuf->buf + oldact, oldpos + *len - oldact);
|
|
if (readlen < 0)
|
|
return NULL;
|
|
*len = oldact - oldpos + readlen;
|
|
}
|
|
u->fbuf->act = oldact + readlen;
|
|
fbuf_debug (u, "fbuf_read done: ");
|
|
return ptr;
|
|
}
|
|
|
|
|
|
/* When the fbuf_getc() inline function runs out of buffer space, it
|
|
calls this function to fill the buffer with bytes for
|
|
reading. Never call this function directly. */
|
|
|
|
int
|
|
fbuf_getc_refill (gfc_unit * u)
|
|
{
|
|
int nread;
|
|
char *p;
|
|
|
|
fbuf_debug (u, "fbuf_getc_refill ");
|
|
|
|
/* Read 80 bytes (average line length?). This is a compromise
|
|
between not needing to call the read() syscall all the time and
|
|
not having to memmove unnecessary stuff when switching to the
|
|
next record. */
|
|
nread = 80;
|
|
|
|
p = fbuf_read (u, &nread);
|
|
|
|
if (p && nread > 0)
|
|
return (unsigned char) u->fbuf->buf[u->fbuf->pos++];
|
|
else
|
|
return EOF;
|
|
}
|