mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 19:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* libio/genops.c (_IO_unbuffer_write): Don't always free the

Browse Source 
buffer.  This is not necessary except in debug mode.  If we don't
	free the buffer but the FILE structure to a list.
	(buffer_free): New function.  Free buffers or tell _IO_unbuffer_write
	to do so.
	* libio/libio.h (struct _IO_FILE): Add new members to keep track
	of which buffers have to be freed.
This commit is contained in:
Ulrich Drepper 2006-01-11 07:55:51 +00:00
parent 3370f2bd3d
commit 7876272372
3 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2006-01-10 Ulrich Drepper <drepper@redhat.com>
* libio/genops.c (_IO_unbuffer_write): Don't always free the
buffer. This is not necessary except in debug mode. If we don't
free the buffer but the FILE structure to a list.
(buffer_free): New function. Free buffers or tell _IO_unbuffer_write
to do so.
* libio/libio.h (struct _IO_FILE): Add new members to keep track
of which buffers have to be freed.
* iconv/gconv_cache.c (free_mem): Don't call munmap if gconv_cache
is NULL.

53
libio/genops.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,1995,1997-2002, 2003, 2004 Free Software Foundation, Inc.
/* Copyright (C) 1993,1995,1997-2002, 2003, 2004, 2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -657,6 +658,7 @@ _IO_no_init (fp, flags, orientation, wd, jmp)
fp->_wide_data->_wide_vtable = jmp;
}
#endif
fp->_freeres_list = NULL;
}
int
@ -914,10 +916,27 @@ INTDEF(_IO_flush_all_linebuffered)
weak_alias (_IO_flush_all_linebuffered, _flushlbf)
#endif
/* The following is a bit tricky. In general, we want to unbuffer the
streams so that all output which follows is seen. If we are not
looking for memory leaks it does not make much sense to free the
actual buffer because this will happen anyway once the program
terminated. If we do want to look for memory leaks we have to free
the buffers. Whether something is freed is determined by the
function sin the libc_freeres section. Those are called as part of
the atexit routine, just like _IO_cleanup. The problem is we do
not know whether the freeres code is called first or _IO_cleanup.
if the former is the case, we set the DEALLOC_BUFFER variable to
true and _IO_unbuffer_write will take care of the rest. If
_IO_unbuffer_write is called first we add the streams to a list
which the freeres function later can walk through. */
static void _IO_unbuffer_write (void);
static bool dealloc_buffers;
static _IO_FILE *freeres_list;
static void
_IO_unbuffer_write ()
_IO_unbuffer_write (void)
{
struct _IO_FILE *fp;
for (fp = (_IO_FILE *) INTUSE(_IO_list_all); fp; fp = fp->_chain)
@ -927,7 +946,19 @@ _IO_unbuffer_write ()
|| (fp->_flags & _IO_IS_APPENDING))
/* Iff stream is un-orientated, it wasn't used. */
&& fp->_mode != 0)
_IO_SETBUF (fp, NULL, 0);
{
if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF))
{
fp->_flags |= _IO_USER_BUF;
fp->_freeres_list = freeres_list;
freeres_list = fp;
fp->_freeres_buf = fp->_IO_buf_base;
fp->_freeres_size = _IO_blen (fp);
}
_IO_SETBUF (fp, NULL, 0);
}
/* Make sure that never again the wide char functions can be
used. */
@ -935,11 +966,25 @@ _IO_unbuffer_write ()
}
}
libc_freeres_fn (buffer_free)
{
dealloc_buffers = true;
while (freeres_list != NULL)
{
FREE_BUF (freeres_list->_freeres_buf, freeres_list->_freeres_size);
freeres_list = freeres_list->_freeres_list;
}
}
int
_IO_cleanup ()
{
/* We do *not* want locking. Some threads might use streams but
that is there problem, we flush them underneath them. */
that is their problem, we flush them underneath them. */
int result = _IO_flush_all_lockp (0);
/* We currently don't have a reliable mechanism for making sure that

10
libio/libio.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-1995,1997-2003,2004,2005 Free Software Foundation, Inc.
/* Copyright (C) 1991-1995,1997-2005,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@cygnus.com>.
@ -317,13 +317,19 @@ struct _IO_FILE_complete
/* Wide character stream stuff. */
struct _IO_codecvt *_codecvt;
struct _IO_wide_data *_wide_data;
struct _IO_FILE *_freeres_list;
void *_freeres_buf;
size_t _freeres_size;
# else
void *__pad1;
void *__pad2;
void *__pad3;
void *__pad4;
size_t __pad5;
# endif
int _mode;
/* Make sure we don't get into trouble again. */
char _unused2[15 * sizeof (int) - 2 * sizeof (void *)];
char _unused2[15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)];
#endif
};