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

libc-cancellation.c cleanup. 

The unrelated function __libc_cleanup_routine should not be in
this file.  Move it into its own file.
This commit is contained in:
Ulrich Drepper 2009-05-16 15:04:27 -07:00
parent cba0ca7925
commit e20c4ef0ef
4 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nptl/ChangeLog
View File

@ -1,5 +1,9 @@
2009-05-16 Ulrich Drepper <drepper@redhat.com>
* libc-cancellation.c: Move __libc_cleanup_routine to...
* libc-cleanup.c: ...here. New file.
* Makefile (routines): Add libc-cleanup.
* cancellation.c (__pthread_disable_asynccancel): Remove unnecessary
test.
* libc-cancellation.c: Use <nptl/cancellation.c: to define the code.

6
nptl/Makefile
View File

@ -1,5 +1,4 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008
# Free Software Foundation, Inc.
# Copyright (C) 2002-2008,2009 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
@ -28,7 +27,8 @@ extra-libs := libpthread
extra-libs-others := $(extra-libs)
install-lib-ldscripts := libpthread.so
routines = alloca_cutoff forward libc-lowlevellock libc-cancellation
routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
libc-cleanup
shared-only-routines = forward
libpthread-routines = nptl-init vars events version \

8
nptl/libc-cancellation.c
View File

@ -23,11 +23,3 @@
#define __pthread_enable_asynccancel __libc_enable_asynccancel
#define __pthread_disable_asynccancel __libc_disable_asynccancel
#include <nptl/cancellation.c>
void
__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
{
if (f->__do_it)
f->__cancel_routine (f->__cancel_arg);
}

28
nptl/libc-cleanup.c Normal file
View File

@ -0,0 +1,28 @@
/* Copyright (C) 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include "pthreadP.h"
void
__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
{
if (f->__do_it)
f->__cancel_routine (f->__cancel_arg);
}