* elf/dl-close.c (_dl_close): Decrement l_opencount before

printing debug message.
	* elf/dl-open.c (dl_open_worker): Always print the new opencount
	in debug messages.
This commit is contained in:
Ulrich Drepper 2005-03-07 08:06:09 +00:00
parent d8505f90bf
commit 21745dfa61
3 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2005-03-07 Ulrich Drepper <drepper@redhat.com>
* elf/dl-close.c (_dl_close): Decrement l_opencount before
printing debug message.
* elf/dl-open.c (dl_open_worker): Always print the new opencount
in debug messages.
2005-03-06 Ulrich Drepper <drepper@redhat.com>
* elf/dl-close.c (_dl_close): Unify debug message format.

View File

@ -138,14 +138,14 @@ _dl_close (void *_map)
/* Decrement the reference count. */
if (map->l_opencount > 1 || map->l_type != lt_loaded)
{
/* Decrement the object's reference counter, not the dependencies'. */
--map->l_opencount;
/* There are still references to this object. Do nothing more. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
_dl_debug_printf ("\nclosing file=%s; opencount=%u\n",
map->l_name, map->l_opencount);
/* Decrement the object's reference counter, not the dependencies'. */
--map->l_opencount;
/* If the direct use counter reaches zero we have to decrement
all the dependencies' usage counter. */
if (map->l_direct_opencount == 0)

View File

@ -282,7 +282,7 @@ dl_open_worker (void *a)
/* Let the user know about the opencount. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
_dl_debug_printf ("opening file=%s [%lu]; opencount=%u\n\n",
new->l_name, new->l_ns, new->l_opencount);
new->l_name, new->l_ns, new->l_opencount + 1);
/* If the user requested the object to be in the global namespace
but it is not so far, add it now. */