qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* libio/genops.c (_IO_un_link, _IO_link_in): Don't use locking if
	_IO_MTSAFE_IO is not defined.
This commit is contained in:
Ulrich Drepper 1999-01-28 11:35:54 +00:00
parent 8ce63ec09b
commit 51e176c2c2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
1999-01-28 Ulrich Drepper <drepper@cygnus.com> 1999-01-28 Ulrich Drepper <drepper@cygnus.com>
* libio/genops.c (_IO_un_link, _IO_link_in): Don't use locking if
_IO_MTSAFE_IO is not defined.
* iconv/gconv_db.c (free_modules_db): Don't free memory of * iconv/gconv_db.c (free_modules_db): Don't free memory of
internal modules. internal modules.

12
libio/genops.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1995, 1997, 1998 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU IO Library. This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -31,7 +31,9 @@
#endif #endif
#include <string.h> #include <string.h>
#ifdef _IO_MTSAFE_IO
static _IO_lock_t list_all_lock = _IO_lock_initializer; static _IO_lock_t list_all_lock = _IO_lock_initializer;
#endif
void void
_IO_un_link (fp) _IO_un_link (fp)
@ -39,8 +41,10 @@ _IO_un_link (fp)
{ {
if (fp->_flags & _IO_LINKED) if (fp->_flags & _IO_LINKED)
{ {
#ifdef _IO_MTSAFE_IO
_IO_FILE **f; _IO_FILE **f;
_IO_lock_lock (list_all_lock); _IO_lock_lock (list_all_lock);
#endif
for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain) for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain)
{ {
if (*f == fp) if (*f == fp)
@ -49,7 +53,9 @@ _IO_un_link (fp)
break; break;
} }
} }
#ifdef _IO_MTSAFE_IO
_IO_lock_unlock (list_all_lock); _IO_lock_unlock (list_all_lock);
#endif
fp->_flags &= ~_IO_LINKED; fp->_flags &= ~_IO_LINKED;
} }
} }
@ -61,10 +67,14 @@ _IO_link_in (fp)
if ((fp->_flags & _IO_LINKED) == 0) if ((fp->_flags & _IO_LINKED) == 0)
{ {
fp->_flags |= _IO_LINKED; fp->_flags |= _IO_LINKED;
#ifdef _IO_MTSAFE_IO
_IO_lock_lock (list_all_lock); _IO_lock_lock (list_all_lock);
#endif
fp->_chain = _IO_list_all; fp->_chain = _IO_list_all;
_IO_list_all = fp; _IO_list_all = fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_unlock (list_all_lock); _IO_lock_unlock (list_all_lock);
#endif
} }
} }