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
388 lines
7.9 KiB
C
388 lines
7.9 KiB
C
/* Implementation of the FGET, FGETC, FPUT, FPUTC, FLUSH
|
|
FTELL, TTYNAM and ISATTY intrinsics.
|
|
Copyright (C) 2005, 2007 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Fortran 95 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 of the License, 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, Inc., 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "io.h"
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
static const int five = 5;
|
|
static const int six = 6;
|
|
|
|
extern int PREFIX(fgetc) (const int *, char *, gfc_charlen_type);
|
|
export_proto_np(PREFIX(fgetc));
|
|
|
|
int
|
|
PREFIX(fgetc) (const int * unit, char * c, gfc_charlen_type c_len)
|
|
{
|
|
int ret;
|
|
size_t s;
|
|
gfc_unit * u = find_unit (*unit);
|
|
|
|
if (u == NULL)
|
|
return -1;
|
|
|
|
s = 1;
|
|
memset (c, ' ', c_len);
|
|
ret = sread (u->s, c, s);
|
|
unlock_unit (u);
|
|
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
if (ret != 1)
|
|
return -1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
|
|
#define FGETC_SUB(kind) \
|
|
extern void fgetc_i ## kind ## _sub \
|
|
(const int *, char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
|
|
export_proto(fgetc_i ## kind ## _sub); \
|
|
void fgetc_i ## kind ## _sub \
|
|
(const int * unit, char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
|
|
{ if (st != NULL) \
|
|
*st = PREFIX(fgetc) (unit, c, c_len); \
|
|
else \
|
|
PREFIX(fgetc) (unit, c, c_len); }
|
|
|
|
FGETC_SUB(1)
|
|
FGETC_SUB(2)
|
|
FGETC_SUB(4)
|
|
FGETC_SUB(8)
|
|
|
|
|
|
extern int PREFIX(fget) (char *, gfc_charlen_type);
|
|
export_proto_np(PREFIX(fget));
|
|
|
|
int
|
|
PREFIX(fget) (char * c, gfc_charlen_type c_len)
|
|
{
|
|
return PREFIX(fgetc) (&five, c, c_len);
|
|
}
|
|
|
|
|
|
#define FGET_SUB(kind) \
|
|
extern void fget_i ## kind ## _sub \
|
|
(char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
|
|
export_proto(fget_i ## kind ## _sub); \
|
|
void fget_i ## kind ## _sub \
|
|
(char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
|
|
{ if (st != NULL) \
|
|
*st = PREFIX(fgetc) (&five, c, c_len); \
|
|
else \
|
|
PREFIX(fgetc) (&five, c, c_len); }
|
|
|
|
FGET_SUB(1)
|
|
FGET_SUB(2)
|
|
FGET_SUB(4)
|
|
FGET_SUB(8)
|
|
|
|
|
|
|
|
extern int PREFIX(fputc) (const int *, char *, gfc_charlen_type);
|
|
export_proto_np(PREFIX(fputc));
|
|
|
|
int
|
|
PREFIX(fputc) (const int * unit, char * c,
|
|
gfc_charlen_type c_len __attribute__((unused)))
|
|
{
|
|
ssize_t s;
|
|
gfc_unit * u = find_unit (*unit);
|
|
|
|
if (u == NULL)
|
|
return -1;
|
|
|
|
s = swrite (u->s, c, 1);
|
|
unlock_unit (u);
|
|
if (s < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
|
|
#define FPUTC_SUB(kind) \
|
|
extern void fputc_i ## kind ## _sub \
|
|
(const int *, char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
|
|
export_proto(fputc_i ## kind ## _sub); \
|
|
void fputc_i ## kind ## _sub \
|
|
(const int * unit, char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
|
|
{ if (st != NULL) \
|
|
*st = PREFIX(fputc) (unit, c, c_len); \
|
|
else \
|
|
PREFIX(fputc) (unit, c, c_len); }
|
|
|
|
FPUTC_SUB(1)
|
|
FPUTC_SUB(2)
|
|
FPUTC_SUB(4)
|
|
FPUTC_SUB(8)
|
|
|
|
|
|
extern int PREFIX(fput) (char *, gfc_charlen_type);
|
|
export_proto_np(PREFIX(fput));
|
|
|
|
int
|
|
PREFIX(fput) (char * c, gfc_charlen_type c_len)
|
|
{
|
|
return PREFIX(fputc) (&six, c, c_len);
|
|
}
|
|
|
|
|
|
#define FPUT_SUB(kind) \
|
|
extern void fput_i ## kind ## _sub \
|
|
(char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
|
|
export_proto(fput_i ## kind ## _sub); \
|
|
void fput_i ## kind ## _sub \
|
|
(char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
|
|
{ if (st != NULL) \
|
|
*st = PREFIX(fputc) (&six, c, c_len); \
|
|
else \
|
|
PREFIX(fputc) (&six, c, c_len); }
|
|
|
|
FPUT_SUB(1)
|
|
FPUT_SUB(2)
|
|
FPUT_SUB(4)
|
|
FPUT_SUB(8)
|
|
|
|
|
|
/* SUBROUTINE FLUSH(UNIT)
|
|
INTEGER, INTENT(IN), OPTIONAL :: UNIT */
|
|
|
|
extern void flush_i4 (GFC_INTEGER_4 *);
|
|
export_proto(flush_i4);
|
|
|
|
void
|
|
flush_i4 (GFC_INTEGER_4 *unit)
|
|
{
|
|
gfc_unit *us;
|
|
|
|
/* flush all streams */
|
|
if (unit == NULL)
|
|
flush_all_units ();
|
|
else
|
|
{
|
|
us = find_unit (*unit);
|
|
if (us != NULL)
|
|
{
|
|
sflush (us->s);
|
|
unlock_unit (us);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
extern void flush_i8 (GFC_INTEGER_8 *);
|
|
export_proto(flush_i8);
|
|
|
|
void
|
|
flush_i8 (GFC_INTEGER_8 *unit)
|
|
{
|
|
gfc_unit *us;
|
|
|
|
/* flush all streams */
|
|
if (unit == NULL)
|
|
flush_all_units ();
|
|
else
|
|
{
|
|
us = find_unit (*unit);
|
|
if (us != NULL)
|
|
{
|
|
sflush (us->s);
|
|
unlock_unit (us);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* FSEEK intrinsic */
|
|
|
|
extern void fseek_sub (int *, GFC_IO_INT *, int *, int *);
|
|
export_proto(fseek_sub);
|
|
|
|
void
|
|
fseek_sub (int * unit, GFC_IO_INT * offset, int * whence, int * status)
|
|
{
|
|
gfc_unit * u = find_unit (*unit);
|
|
ssize_t result = -1;
|
|
|
|
if (u != NULL && is_seekable(u->s))
|
|
{
|
|
result = sseek(u->s, *offset, *whence);
|
|
|
|
unlock_unit (u);
|
|
}
|
|
|
|
if (status)
|
|
*status = (result < 0 ? -1 : 0);
|
|
}
|
|
|
|
|
|
|
|
/* FTELL intrinsic */
|
|
|
|
extern size_t PREFIX(ftell) (int *);
|
|
export_proto_np(PREFIX(ftell));
|
|
|
|
size_t
|
|
PREFIX(ftell) (int * unit)
|
|
{
|
|
gfc_unit * u = find_unit (*unit);
|
|
size_t ret;
|
|
if (u == NULL)
|
|
return ((size_t) -1);
|
|
ret = (size_t) stell (u->s);
|
|
unlock_unit (u);
|
|
return ret;
|
|
}
|
|
|
|
#define FTELL_SUB(kind) \
|
|
extern void ftell_i ## kind ## _sub (int *, GFC_INTEGER_ ## kind *); \
|
|
export_proto(ftell_i ## kind ## _sub); \
|
|
void \
|
|
ftell_i ## kind ## _sub (int * unit, GFC_INTEGER_ ## kind * offset) \
|
|
{ \
|
|
gfc_unit * u = find_unit (*unit); \
|
|
if (u == NULL) \
|
|
*offset = -1; \
|
|
else \
|
|
{ \
|
|
*offset = stell (u->s); \
|
|
unlock_unit (u); \
|
|
} \
|
|
}
|
|
|
|
FTELL_SUB(1)
|
|
FTELL_SUB(2)
|
|
FTELL_SUB(4)
|
|
FTELL_SUB(8)
|
|
|
|
|
|
|
|
/* LOGICAL FUNCTION ISATTY(UNIT)
|
|
INTEGER, INTENT(IN) :: UNIT */
|
|
|
|
extern GFC_LOGICAL_4 isatty_l4 (int *);
|
|
export_proto(isatty_l4);
|
|
|
|
GFC_LOGICAL_4
|
|
isatty_l4 (int *unit)
|
|
{
|
|
gfc_unit *u;
|
|
GFC_LOGICAL_4 ret = 0;
|
|
|
|
u = find_unit (*unit);
|
|
if (u != NULL)
|
|
{
|
|
ret = (GFC_LOGICAL_4) stream_isatty (u->s);
|
|
unlock_unit (u);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
extern GFC_LOGICAL_8 isatty_l8 (int *);
|
|
export_proto(isatty_l8);
|
|
|
|
GFC_LOGICAL_8
|
|
isatty_l8 (int *unit)
|
|
{
|
|
gfc_unit *u;
|
|
GFC_LOGICAL_8 ret = 0;
|
|
|
|
u = find_unit (*unit);
|
|
if (u != NULL)
|
|
{
|
|
ret = (GFC_LOGICAL_8) stream_isatty (u->s);
|
|
unlock_unit (u);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
/* SUBROUTINE TTYNAM(UNIT,NAME)
|
|
INTEGER,SCALAR,INTENT(IN) :: UNIT
|
|
CHARACTER,SCALAR,INTENT(OUT) :: NAME */
|
|
|
|
extern void ttynam_sub (int *, char *, gfc_charlen_type);
|
|
export_proto(ttynam_sub);
|
|
|
|
void
|
|
ttynam_sub (int *unit, char * name, gfc_charlen_type name_len)
|
|
{
|
|
gfc_unit *u;
|
|
char * n;
|
|
int i;
|
|
|
|
memset (name, ' ', name_len);
|
|
u = find_unit (*unit);
|
|
if (u != NULL)
|
|
{
|
|
n = stream_ttyname (u->s);
|
|
if (n != NULL)
|
|
{
|
|
i = 0;
|
|
while (*n && i < name_len)
|
|
name[i++] = *(n++);
|
|
}
|
|
unlock_unit (u);
|
|
}
|
|
}
|
|
|
|
|
|
extern void ttynam (char **, gfc_charlen_type *, int);
|
|
export_proto(ttynam);
|
|
|
|
void
|
|
ttynam (char ** name, gfc_charlen_type * name_len, int unit)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
u = find_unit (unit);
|
|
if (u != NULL)
|
|
{
|
|
*name = stream_ttyname (u->s);
|
|
if (*name != NULL)
|
|
{
|
|
*name_len = strlen (*name);
|
|
*name = strdup (*name);
|
|
unlock_unit (u);
|
|
return;
|
|
}
|
|
unlock_unit (u);
|
|
}
|
|
|
|
*name_len = 0;
|
|
*name = NULL;
|
|
}
|