OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Share vtables instead of replicating them for each unit.

Browse Source 
2012-03-16  Janne Blomqvist  <jb@gcc.gnu.org>

	* io/unix.h (struct stream): Rename to stream_vtable.
	(struct stream): New struct definition.
	(sread): Dereference vtable pointer.
	(swrite): Likewise.
	(sseek): Likewise.
	(struncate): Likewise.
	(sflush): Likewise.
	(sclose): Likewise.
	* io/unix.c (raw_vtable): New variable.
	(buf_vtable): Likewise.
	(mem_vtable): Likewise.
	(mem4_vtable): Likewise.
	(raw_init): Assign vtable pointer.
	(buf_init): Likewise.
	(open_internal): Likewise.
	(open_internal4): Likewise.

From-SVN: r185454
This commit is contained in:
Janne Blomqvist 2012-03-16 10:30:26 +02:00
parent c4256b35bf
commit 33959d1d3c
3 changed files with 91 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libgfortran/ChangeLog
View File

@ -1,3 +1,22 @@
2012-03-16 Janne Blomqvist <jb@gcc.gnu.org>
* io/unix.h (struct stream): Rename to stream_vtable.
(struct stream): New struct definition.
(sread): Dereference vtable pointer.
(swrite): Likewise.
(sseek): Likewise.
(struncate): Likewise.
(sflush): Likewise.
(sclose): Likewise.
* io/unix.c (raw_vtable): New variable.
(buf_vtable): Likewise.
(mem_vtable): Likewise.
(mem4_vtable): Likewise.
(raw_init): Assign vtable pointer.
(buf_init): Likewise.
(open_internal): Likewise.
(open_internal4): Likewise.
2012-03-15 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/52434

87
libgfortran/io/unix.c
View File

@ -401,17 +401,21 @@ raw_close (unix_stream * s)
return retval;
}
static const struct stream_vtable raw_vtable = {
.read = (void *) raw_read,
.write = (void *) raw_write,
.seek = (void *) raw_seek,
.tell = (void *) raw_tell,
.size = (void *) raw_size,
.trunc = (void *) raw_truncate,
.close = (void *) raw_close,
.flush = (void *) raw_flush
};
static int
raw_init (unix_stream * s)
{
s->st.read = (void *) raw_read;
s->st.write = (void *) raw_write;
s->st.seek = (void *) raw_seek;
s->st.tell = (void *) raw_tell;
s->st.size = (void *) raw_size;
s->st.trunc = (void *) raw_truncate;
s->st.close = (void *) raw_close;
s->st.flush = (void *) raw_flush;
s->st.vptr = &raw_vtable;
s->buffer = NULL;
return 0;
@ -619,17 +623,21 @@ buf_close (unix_stream * s)
return raw_close (s);
}
static const struct stream_vtable buf_vtable = {
.read = (void *) buf_read,
.write = (void *) buf_write,
.seek = (void *) buf_seek,
.tell = (void *) buf_tell,
.size = (void *) buf_size,
.trunc = (void *) buf_truncate,
.close = (void *) buf_close,
.flush = (void *) buf_flush
};
static int
buf_init (unix_stream * s)
{
s->st.read = (void *) buf_read;
s->st.write = (void *) buf_write;
s->st.seek = (void *) buf_seek;
s->st.tell = (void *) buf_tell;
s->st.size = (void *) buf_size;
s->st.trunc = (void *) buf_truncate;
s->st.close = (void *) buf_close;
s->st.flush = (void *) buf_flush;
s->st.vptr = &buf_vtable;
s->buffer = get_mem (BUFFER_SIZE);
return 0;
@ -872,6 +880,31 @@ mem_close (unix_stream * s)
return 0;
}
static const struct stream_vtable mem_vtable = {
.read = (void *) mem_read,
.write = (void *) mem_write,
.seek = (void *) mem_seek,
.tell = (void *) mem_tell,
/* buf_size is not a typo, we just reuse an identical
implementation. */
.size = (void *) buf_size,
.trunc = (void *) mem_truncate,
.close = (void *) mem_close,
.flush = (void *) mem_flush
};
static const struct stream_vtable mem4_vtable = {
.read = (void *) mem_read4,
.write = (void *) mem_write4,
.seek = (void *) mem_seek,
.tell = (void *) mem_tell,
/* buf_size is not a typo, we just reuse an identical
implementation. */
.size = (void *) buf_size,
.trunc = (void *) mem_truncate,
.close = (void *) mem_close,
.flush = (void *) mem_flush
};
/*********************************************************************
Public functions -- A reimplementation of this module needs to
@ -895,16 +928,7 @@ open_internal (char *base, int length, gfc_offset offset)
s->logical_offset = 0;
s->active = s->file_length = length;
s->st.close = (void *) mem_close;
s->st.seek = (void *) mem_seek;
s->st.tell = (void *) mem_tell;
/* buf_size is not a typo, we just reuse an identical
implementation. */
s->st.size = (void *) buf_size;
s->st.trunc = (void *) mem_truncate;
s->st.read = (void *) mem_read;
s->st.write = (void *) mem_write;
s->st.flush = (void *) mem_flush;
s->st.vptr = &mem_vtable;
return (stream *) s;
}
@ -926,16 +950,7 @@ open_internal4 (char *base, int length, gfc_offset offset)
s->logical_offset = 0;
s->active = s->file_length = length;
s->st.close = (void *) mem_close;
s->st.seek = (void *) mem_seek;
s->st.tell = (void *) mem_tell;
/* buf_size is not a typo, we just reuse an identical
implementation. */
s->st.size = (void *) buf_size;
s->st.trunc = (void *) mem_truncate;
s->st.read = (void *) mem_read4;
s->st.write = (void *) mem_write4;
s->st.flush = (void *) mem_flush;
s->st.vptr = &mem4_vtable;
return (stream *) s;
}

39
libgfortran/io/unix.h
View File

@ -28,68 +28,71 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "io.h"
struct stream_vtable
{
ssize_t (* const read) (struct stream *, void *, ssize_t);
ssize_t (* const write) (struct stream *, const void *, ssize_t);
gfc_offset (* const seek) (struct stream *, gfc_offset, int);
gfc_offset (* const tell) (struct stream *);
gfc_offset (* const size) (struct stream *);
/* Avoid keyword truncate due to AIX namespace collision. */
int (* const trunc) (struct stream *, gfc_offset);
int (* const flush) (struct stream *);
int (* const close) (struct stream *);
};
struct stream
{
ssize_t (*read) (struct stream *, void *, ssize_t);
ssize_t (*write) (struct stream *, const void *, ssize_t);
gfc_offset (*seek) (struct stream *, gfc_offset, int);
gfc_offset (*tell) (struct stream *);
gfc_offset (*size) (struct stream *);
/* Avoid keyword truncate due to AIX namespace collision. */
int (*trunc) (struct stream *, gfc_offset);
int (*flush) (struct stream *);
int (*close) (struct stream *);
const struct stream_vtable *vptr;
};
/* Inline functions for doing file I/O given a stream. */
static inline ssize_t
sread (stream * s, void * buf, ssize_t nbyte)
{
return s->read (s, buf, nbyte);
return s->vptr->read (s, buf, nbyte);
}
static inline ssize_t
swrite (stream * s, const void * buf, ssize_t nbyte)
{
return s->write (s, buf, nbyte);
return s->vptr->write (s, buf, nbyte);
}
static inline gfc_offset
sseek (stream * s, gfc_offset offset, int whence)
{
return s->seek (s, offset, whence);
return s->vptr->seek (s, offset, whence);
}
static inline gfc_offset
stell (stream * s)
{
return s->tell (s);
return s->vptr->tell (s);
}
static inline gfc_offset
ssize (stream * s)
{
return s->size (s);
return s->vptr->size (s);
}
static inline int
struncate (stream * s, gfc_offset length)
{
return s->trunc (s, length);
return s->vptr->trunc (s, length);
}
static inline int
sflush (stream * s)
{
return s->flush (s);
return s->vptr->flush (s);
}
static inline int
sclose (stream * s)
{
return s->close (s);
return s->vptr->close (s);
}