[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8711 - in /branches/eglibc-2_10/libc: ./ nptl/sysdeps/pthread/ nptl/sysdeps/pthread/bits/
- To: commits@xxxxxxxxxx
- Subject: [commits] r8711 - in /branches/eglibc-2_10/libc: ./ nptl/sysdeps/pthread/ nptl/sysdeps/pthread/bits/
- From: maxim@xxxxxxxxxx
- Date: Mon, 27 Jul 2009 16:24:12 -0000
Author: maxim
Date: Mon Jul 27 09:24:12 2009
New Revision: 8711
Log:
Revert previous commit to the wrong branch:
2009-07-27 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
Add BIG_MACROS option group.
* option-groups.def (OPTION_EGLIBC_BIG_MACROS): Define new option
group.
* option-groups.defaults (OPTION_EGLIBC_BIG_MACROS): Define default.
* nptl/sysdeps/pthread/small-macros-fns.c: New file. Define wrappers.
* nptl/sysdeps/pthread/Makefile (nptl/sysdep_routines): Add
small-macros-fns.
* nptl/sysdeps/pthread/bits/libc-lock.h (gnu/option-groups.h): Include.
(errno.h): Include, make implicit dependency explicit.
(__libc_lock_lock, __libc_lock_lock_recursive),
(__libc_lock_trylock, __libc_lock_trylock_recursive),
(__libc_lock_unlock, __libc_lock_unlock_recursive):
If OPTION_EGLIBC_BIG_MACROS, define to macro;
define to function call otherwise.
Removed:
branches/eglibc-2_10/libc/nptl/sysdeps/pthread/small-macros-fns.c
Modified:
branches/eglibc-2_10/libc/ChangeLog.eglibc
branches/eglibc-2_10/libc/nptl/sysdeps/pthread/Makefile
branches/eglibc-2_10/libc/nptl/sysdeps/pthread/bits/libc-lock.h
branches/eglibc-2_10/libc/option-groups.def
branches/eglibc-2_10/libc/option-groups.defaults
Modified: branches/eglibc-2_10/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_10/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_10/libc/ChangeLog.eglibc Mon Jul 27 09:24:12 2009
@@ -1,3 +1,23 @@
+2009-07-27 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
+
+ Revert previous commit to the wrong branch:
+
+ 2009-07-27 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
+ Add BIG_MACROS option group.
+ * option-groups.def (OPTION_EGLIBC_BIG_MACROS): Define new option
+ group.
+ * option-groups.defaults (OPTION_EGLIBC_BIG_MACROS): Define default.
+ * nptl/sysdeps/pthread/small-macros-fns.c: New file. Define wrappers.
+ * nptl/sysdeps/pthread/Makefile (nptl/sysdep_routines): Add
+ small-macros-fns.
+ * nptl/sysdeps/pthread/bits/libc-lock.h (gnu/option-groups.h): Include.
+ (errno.h): Include, make implicit dependency explicit.
+ (__libc_lock_lock, __libc_lock_lock_recursive),
+ (__libc_lock_trylock, __libc_lock_trylock_recursive),
+ (__libc_lock_unlock, __libc_lock_unlock_recursive):
+ If OPTION_EGLIBC_BIG_MACROS, define to macro;
+ define to function call otherwise.
+
2009-07-27 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
Add BIG_MACROS option group.
Modified: branches/eglibc-2_10/libc/nptl/sysdeps/pthread/Makefile
==============================================================================
--- branches/eglibc-2_10/libc/nptl/sysdeps/pthread/Makefile (original)
+++ branches/eglibc-2_10/libc/nptl/sysdeps/pthread/Makefile Mon Jul 27 09:24:12 2009
@@ -25,9 +25,6 @@
ifeq ($(subdir),nptl)
libpthread-sysdep_routines += errno-loc
-ifeq ($(OPTION_EGLIBC_BIG_MACROS),n)
-sysdep_routines += small-macros-fns
-endif
endif
ifeq ($(subdir),rt)
Modified: branches/eglibc-2_10/libc/nptl/sysdeps/pthread/bits/libc-lock.h
==============================================================================
--- branches/eglibc-2_10/libc/nptl/sysdeps/pthread/bits/libc-lock.h (original)
+++ branches/eglibc-2_10/libc/nptl/sysdeps/pthread/bits/libc-lock.h Mon Jul 27 09:24:12 2009
@@ -35,8 +35,6 @@
# include <lowlevellock.h>
# include <tls.h>
# include <pthread-functions.h>
-# include <errno.h> /* For EBUSY. */
-# include <gnu/option-groups.h> /* For __OPTION_EGLIBC_BIG_MACROS. */
#endif
/* Mutex type. */
@@ -240,20 +238,8 @@
/* Lock the named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern void __libc_lock_lock_fn (__libc_lock_t *);
-libc_hidden_proto (__libc_lock_lock_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
# define __libc_lock_lock(NAME) \
({ lll_lock (NAME, LLL_PRIVATE); 0; })
-# else
-# define __libc_lock_lock(NAME) \
- __libc_lock_lock_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_lock(NAME) \
__libc_maybe_call (__pthread_mutex_lock, (&(NAME)), 0)
@@ -265,14 +251,6 @@
/* Lock the recursive named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern void __libc_lock_lock_recursive_fn (__libc_lock_recursive_t *);
-libc_hidden_proto (__libc_lock_lock_recursive_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
# define __libc_lock_lock_recursive(NAME) \
do { \
void *self = THREAD_SELF; \
@@ -283,10 +261,6 @@
} \
++(NAME).cnt; \
} while (0)
-# else
-# define __libc_lock_lock_recursive(NAME) \
- __libc_lock_lock_recursive_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_lock_recursive(NAME) \
__libc_maybe_call (__pthread_mutex_lock, (&(NAME).mutex), 0)
@@ -294,20 +268,8 @@
/* Try to lock the named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern int __libc_lock_trylock_fn (__libc_lock_t *);
-libc_hidden_proto (__libc_lock_trylock_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
# define __libc_lock_trylock(NAME) \
lll_trylock (NAME)
-# else
-# define __libc_lock_trylock(NAME) \
- __libc_lock_trylock_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_trylock(NAME) \
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0)
@@ -319,14 +281,6 @@
/* Try to lock the recursive named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern int __libc_lock_trylock_recursive_fn (__libc_lock_recursive_t *);
-libc_hidden_proto (__libc_lock_trylock_recursive_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
# define __libc_lock_trylock_recursive(NAME) \
({ \
int result = 0; \
@@ -345,10 +299,6 @@
++(NAME).cnt; \
result; \
})
-# else
-# define __libc_lock_trylock_recursive(NAME) \
- __libc_lock_trylock_recursive_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_trylock_recursive(NAME) \
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0)
@@ -359,20 +309,8 @@
/* Unlock the named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS, or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern void __libc_lock_unlock_fn (__libc_lock_t *);
-libc_hidden_proto (__libc_lock_unlock_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
-# else
-# define __libc_lock_unlock(NAME) \
- __libc_lock_unlock_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_unlock(NAME) \
__libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0)
@@ -382,14 +320,6 @@
/* Unlock the recursive named lock variable. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if __OPTION_EGLIBC_BIG_MACROS != 1
-/* EGLIBC: Declare wrapper function for a big macro if either
- !__OPTION_EGLIBC_BIG_MACROS, or we are using a back door from
- small-macros-fns.c (__OPTION_EGLIBC_BIG_MACROS == 2). */
-extern void __libc_lock_unlock_recursive_fn (__libc_lock_recursive_t *);
-libc_hidden_proto (__libc_lock_unlock_recursive_fn);
-# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */
-# if __OPTION_EGLIBC_BIG_MACROS
/* We do no error checking here. */
# define __libc_lock_unlock_recursive(NAME) \
do { \
@@ -399,10 +329,6 @@
lll_unlock ((NAME).lock, LLL_PRIVATE); \
} \
} while (0)
-# else
-# define __libc_lock_unlock_recursive(NAME) \
- __libc_lock_unlock_recursive_fn (&(NAME))
-# endif /* __OPTION_EGLIBC_BIG_MACROS */
#else
# define __libc_lock_unlock_recursive(NAME) \
__libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0)
Modified: branches/eglibc-2_10/libc/option-groups.def
==============================================================================
--- branches/eglibc-2_10/libc/option-groups.def (original)
+++ branches/eglibc-2_10/libc/option-groups.def Mon Jul 27 09:24:12 2009
@@ -84,14 +84,6 @@
backtrace
backtrace_symbols
backtrace_symbols_fd
-
-config OPTION_EGLIBC_BIG_MACROS
- bool "Use extensive inline code"
- help
- This option group specifies whether certain pieces of code
- should be inlined to achieve maximum speed. If this option
- group is not selected, function calls will be used instead,
- hence reducing the library footprint.
config OPTION_EGLIBC_BSD
bool "BSD-specific functions, and their compatibility stubs"
Modified: branches/eglibc-2_10/libc/option-groups.defaults
==============================================================================
--- branches/eglibc-2_10/libc/option-groups.defaults (original)
+++ branches/eglibc-2_10/libc/option-groups.defaults Mon Jul 27 09:24:12 2009
@@ -10,7 +10,6 @@
# By default, all option groups are enabled.
OPTION_EGLIBC_ADVANCED_INET6 = y
OPTION_EGLIBC_BACKTRACE = y
-OPTION_EGLIBC_BIG_MACROS = y
OPTION_EGLIBC_BSD = y
OPTION_EGLIBC_CXX_TESTS = y
OPTION_EGLIBC_CATGETS = y