git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libfortran/78549 (Very slow formatted internal file output) 

2017-11-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/78549
	* io/io.h (newunit_free): Add declaration. Clean some whitespace.
	* io/transfer.c (st_read_done, st_write_done): Call newunit_free.
	* io/unit.c (newunit_free): Change type from static void to void.

From-SVN: r254982
This commit is contained in:
Jerry DeLisle 2017-11-21 02:17:11 +00:00
parent 34b81eb96c
commit 8c09856788
4 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgfortran/ChangeLog
View File

@ -1,3 +1,10 @@
2017-11-20 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/78549
* io/io.h (newunit_free): Add declaration. Clean some whitespace.
* io/transfer.c (st_read_done, st_write_done): Call newunit_free.
* io/unit.c (newunit_free): Change type from static void to void.
2017-11-19 Janne Blomqvist <jb@gcc.gnu.org> 2017-11-19 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/44292 PR fortran/44292

11
libgfortran/io/io.h
View File

@ -760,18 +760,21 @@ internal_proto(find_or_create_unit);
extern gfc_unit *get_unit (st_parameter_dt *, int); extern gfc_unit *get_unit (st_parameter_dt *, int);
internal_proto(get_unit); internal_proto(get_unit);
extern void unlock_unit (gfc_unit *); extern void unlock_unit(gfc_unit *);
internal_proto(unlock_unit); internal_proto(unlock_unit);
extern void finish_last_advance_record (gfc_unit *u); extern void finish_last_advance_record (gfc_unit *u);
internal_proto (finish_last_advance_record); internal_proto(finish_last_advance_record);
extern int unit_truncate (gfc_unit *, gfc_offset, st_parameter_common *); extern int unit_truncate(gfc_unit *, gfc_offset, st_parameter_common *);
internal_proto (unit_truncate); internal_proto(unit_truncate);
extern int newunit_alloc (void); extern int newunit_alloc (void);
internal_proto(newunit_alloc); internal_proto(newunit_alloc);
extern void newunit_free (int);
internal_proto(newunit_free);
/* open.c */ /* open.c */

44
libgfortran/io/transfer.c
View File

@ -4087,16 +4087,19 @@ st_read_done (st_parameter_dt *dtp)
if (dtp->u.p.current_unit != NULL if (dtp->u.p.current_unit != NULL
&& dtp->u.p.current_unit->child_dtio == 0) && dtp->u.p.current_unit->child_dtio == 0)
{ {
if (is_internal_unit (dtp) && if (is_internal_unit (dtp))
(dtp->common.flags & IOPARM_DT_HAS_UDTIO) == 0) {
{ if ((dtp->common.flags & IOPARM_DT_HAS_UDTIO) == 0)
free (dtp->u.p.current_unit->filename); {
dtp->u.p.current_unit->filename = NULL; free (dtp->u.p.current_unit->filename);
free (dtp->u.p.current_unit->s); dtp->u.p.current_unit->filename = NULL;
dtp->u.p.current_unit->s = NULL; free (dtp->u.p.current_unit->s);
if (dtp->u.p.current_unit->ls) dtp->u.p.current_unit->s = NULL;
free (dtp->u.p.current_unit->ls); if (dtp->u.p.current_unit->ls)
dtp->u.p.current_unit->ls = NULL; free (dtp->u.p.current_unit->ls);
dtp->u.p.current_unit->ls = NULL;
}
newunit_free (dtp->common.unit);
} }
if (is_internal_unit (dtp) || dtp->u.p.format_not_saved) if (is_internal_unit (dtp) || dtp->u.p.format_not_saved)
{ {
@ -4155,16 +4158,19 @@ st_write_done (st_parameter_dt *dtp)
/* If this is a parent WRITE statement we do not need to retain the /* If this is a parent WRITE statement we do not need to retain the
internal unit structure for child use. */ internal unit structure for child use. */
if (is_internal_unit (dtp) && if (is_internal_unit (dtp))
(dtp->common.flags & IOPARM_DT_HAS_UDTIO) == 0)
{ {
free (dtp->u.p.current_unit->filename); if ((dtp->common.flags & IOPARM_DT_HAS_UDTIO) == 0)
dtp->u.p.current_unit->filename = NULL; {
free (dtp->u.p.current_unit->s); free (dtp->u.p.current_unit->filename);
dtp->u.p.current_unit->s = NULL; dtp->u.p.current_unit->filename = NULL;
if (dtp->u.p.current_unit->ls) free (dtp->u.p.current_unit->s);
free (dtp->u.p.current_unit->ls); dtp->u.p.current_unit->s = NULL;
dtp->u.p.current_unit->ls = NULL; if (dtp->u.p.current_unit->ls)
free (dtp->u.p.current_unit->ls);
dtp->u.p.current_unit->ls = NULL;
}
newunit_free (dtp->common.unit);
} }
if (is_internal_unit (dtp) || dtp->u.p.format_not_saved) if (is_internal_unit (dtp) || dtp->u.p.format_not_saved)
{ {

3
libgfortran/io/unit.c
View File

@ -89,7 +89,6 @@ static int newunit_size; /* Total number of elements in the newunits array. */
units are allocated, above and equal to the LWI there may be both units are allocated, above and equal to the LWI there may be both
allocated and free units. */ allocated and free units. */
static int newunit_lwi; static int newunit_lwi;
static void newunit_free (int);
/* Unit numbers assigned with NEWUNIT start from here. */ /* Unit numbers assigned with NEWUNIT start from here. */
#define NEWUNIT_START -10 #define NEWUNIT_START -10
@ -911,7 +910,7 @@ newunit_alloc (void)
/* Free a previously allocated newunit= unit number. unit_lock must /* Free a previously allocated newunit= unit number. unit_lock must
be held when calling. */ be held when calling. */
static void void
newunit_free (int unit) newunit_free (int unit)
{ {
int ind = -unit + NEWUNIT_START; int ind = -unit + NEWUNIT_START;