svn commit: branches/uClibc-nptl: libc/misc/pthread test/nptl
sjhill at uclibc.org
sjhill at uclibc.org
Tue Dec 6 04:46:25 UTC 2005
Author: sjhill
Date: 2005-12-05 20:45:23 -0800 (Mon, 05 Dec 2005)
New Revision: 12687
Log:
Test actually does not pass. Merge from trunk.
Removed:
branches/uClibc-nptl/test/nptl/tst-cancel1.c
Modified:
branches/uClibc-nptl/libc/misc/pthread/weaks.c
Changeset:
Modified: branches/uClibc-nptl/libc/misc/pthread/weaks.c
===================================================================
--- branches/uClibc-nptl/libc/misc/pthread/weaks.c 2005-12-06 04:42:43 UTC (rev 12686)
+++ branches/uClibc-nptl/libc/misc/pthread/weaks.c 2005-12-06 04:45:23 UTC (rev 12687)
@@ -22,46 +22,47 @@
#include <limits.h>
#include <stdlib.h>
-static int __pthread_return_0 __P ((void));
-static int __pthread_return_1 __P ((void));
-
-static int
-__pthread_return_0 (void)
-{
- return 0;
-}
-
-static int
-__pthread_return_1 (void)
-{
- return 1;
-}
-
/**********************************************************************/
/* Weaks for application/library use.
*
+ * We need to define weaks here to cover all the pthread functions that
+ * libc itself will use so that we aren't forced to link libc.so to
+ * libpthread.so. When an application doesn't use pthreads support,
+ * the locking functions used by libc itself basically become no-ops.
+ * However, if the application uses pthreads, then it will pull in
+ * libpthread.so whose symbols will override these weaks magically
+ * turning the internal libc mutex calls from no-ops to real locking
+ * calls.
+ */
+
+/* glibc itself defines all these, but we don't need them in uClibc
+ *
* Verified by comparing to glibc's linuxthreads/forward.c and defined
* only those that are in the glibc abi.
* The commented aliases are ones that were previously defined in uClibc
* and which I left in for documentation.
*/
+static int __pthread_return_0 __P ((void));
+static int __pthread_return_0 (void) { return 0; }
+
+/*
weak_alias (__pthread_return_0, pthread_attr_destroy)
weak_alias (__pthread_return_0, pthread_attr_getdetachstate)
weak_alias (__pthread_return_0, pthread_attr_getinheritsched)
weak_alias (__pthread_return_0, pthread_attr_getschedparam)
weak_alias (__pthread_return_0, pthread_attr_getschedpolicy)
weak_alias (__pthread_return_0, pthread_attr_getscope)
-/* weak_alias (__pthread_return_0, pthread_attr_getstackaddr) */
-/* weak_alias (__pthread_return_0, pthread_attr_getstacksize) */
+weak_alias (__pthread_return_0, pthread_attr_getstackaddr)
+weak_alias (__pthread_return_0, pthread_attr_getstacksize)
weak_alias (__pthread_return_0, pthread_attr_init)
weak_alias (__pthread_return_0, pthread_attr_setdetachstate)
weak_alias (__pthread_return_0, pthread_attr_setinheritsched)
weak_alias (__pthread_return_0, pthread_attr_setschedparam)
weak_alias (__pthread_return_0, pthread_attr_setschedpolicy)
weak_alias (__pthread_return_0, pthread_attr_setscope)
-/* weak_alias (__pthread_return_0, pthread_attr_setstackaddr) */
-/* weak_alias (__pthread_return_0, pthread_attr_setstacksize) */
+weak_alias (__pthread_return_0, pthread_attr_setstackaddr)
+weak_alias (__pthread_return_0, pthread_attr_setstacksize)
weak_alias (__pthread_return_0, pthread_cond_broadcast)
weak_alias (__pthread_return_0, pthread_cond_destroy)
weak_alias (__pthread_return_0, pthread_cond_init)
@@ -71,44 +72,44 @@
weak_alias (__pthread_return_0, pthread_condattr_destroy)
weak_alias (__pthread_return_0, pthread_condattr_init)
weak_alias (__pthread_return_0, pthread_getschedparam)
-/* weak_alias (__pthread_return_0, pthread_getcancelstate) */
-/* weak_alias (__pthread_return_0, pthread_getconcurrency) */
-/* weak_alias (__pthread_return_0, pthread_getschedparam) */
+weak_alias (__pthread_return_0, pthread_getcancelstate)
+weak_alias (__pthread_return_0, pthread_getconcurrency)
weak_alias (__pthread_return_0, pthread_mutex_destroy)
weak_alias (__pthread_return_0, pthread_mutex_init)
weak_alias (__pthread_return_0, pthread_mutex_lock)
-/* weak_alias (__pthread_return_0, pthread_mutex_trylock) */
+weak_alias (__pthread_return_0, pthread_mutex_trylock)
weak_alias (__pthread_return_0, pthread_mutex_unlock)
weak_alias (__pthread_return_0, pthread_mutexattr_destroy)
-/* weak_alias (__pthread_return_0, pthread_mutexattr_gettype) */
+weak_alias (__pthread_return_0, pthread_mutexattr_gettype)
weak_alias (__pthread_return_0, pthread_mutexattr_init)
weak_alias (__pthread_return_0, pthread_mutexattr_settype)
-/* weak_alias (__pthread_return_0, pthread_rwlock_destroy) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_init) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_rdlock) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_tryrdlock) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_trywrlock) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_unlock) */
-/* weak_alias (__pthread_return_0, pthread_rwlock_wrlock) */
-/* weak_alias (__pthread_return_0, pthread_rwlockattr_destroy) */
-/* weak_alias (__pthread_return_0, pthread_rwlockattr_getpshared) */
-/* weak_alias (__pthread_return_0, pthread_rwlockattr_init) */
-/* weak_alias (__pthread_return_0, pthread_rwlockattr_setpshared) */
+weak_alias (__pthread_return_0, pthread_rwlock_destroy)
+weak_alias (__pthread_return_0, pthread_rwlock_init)
+weak_alias (__pthread_return_0, pthread_rwlock_rdlock)
+weak_alias (__pthread_return_0, pthread_rwlock_tryrdlock)
+weak_alias (__pthread_return_0, pthread_rwlock_trywrlock)
+weak_alias (__pthread_return_0, pthread_rwlock_unlock)
+weak_alias (__pthread_return_0, pthread_rwlock_wrlock)
+weak_alias (__pthread_return_0, pthread_rwlockattr_destroy)
+weak_alias (__pthread_return_0, pthread_rwlockattr_getpshared)
+weak_alias (__pthread_return_0, pthread_rwlockattr_init)
+weak_alias (__pthread_return_0, pthread_rwlockattr_setpshared)
weak_alias (__pthread_return_0, pthread_self)
weak_alias (__pthread_return_0, pthread_setcancelstate)
weak_alias (__pthread_return_0, pthread_setcanceltype)
-/* weak_alias (__pthread_return_0, pthread_setconcurrency) */
+weak_alias (__pthread_return_0, pthread_setconcurrency)
weak_alias (__pthread_return_0, pthread_setschedparam)
-/* Those are pthread functions which return 1 if successful. */
+static int __pthread_return_1 __P ((void));
+static int __pthread_return_1 (void) { return 1; }
+
weak_alias (__pthread_return_1, pthread_equal)
-/* pthread_exit () is a special case. */
-void weak_function
-pthread_exit (void *retval)
+void weak_function pthread_exit (void *retval)
{
exit (EXIT_SUCCESS);
}
+*/
/**********************************************************************/
/* Weaks used internally by the C library. */
@@ -116,5 +117,10 @@
weak_alias (__pthread_return_0, __pthread_mutex_lock)
weak_alias (__pthread_return_0, __pthread_mutex_trylock)
weak_alias (__pthread_return_0, __pthread_mutex_unlock)
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+weak_alias (__pthread_return_0, pthread_mutexattr_init)
+weak_alias (__pthread_return_0, pthread_mutexattr_settype)
+weak_alias (__pthread_return_0, pthread_mutexattr_destroy)
+#endif
/**********************************************************************/
Deleted: branches/uClibc-nptl/test/nptl/tst-cancel1.c
===================================================================
--- branches/uClibc-nptl/test/nptl/tst-cancel1.c 2005-12-06 04:42:43 UTC (rev 12686)
+++ branches/uClibc-nptl/test/nptl/tst-cancel1.c 2005-12-06 04:45:23 UTC (rev 12687)
@@ -1,163 +0,0 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at 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 <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-static pthread_mutex_t m1 = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t m2 = PTHREAD_MUTEX_INITIALIZER;
-
-static int cntr;
-
-
-static void
-cleanup (void *arg)
-{
- if (arg != (void *) 42l)
- cntr = 42;
- else
- cntr = 1;
-}
-
-
-static void *
-tf (void *arg)
-{
- /* Ignore all signals. This must not have any effect on delivering
- the cancellation signal. */
- sigset_t ss;
-
- sigfillset (&ss);
-
- if (pthread_sigmask (SIG_BLOCK, &ss, NULL) != 0)
- {
- puts ("pthread_sigmask failed");
- exit (1);
- }
-
- pthread_cleanup_push (cleanup, (void *) 42l);
-
- int err = pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- if (err != 0)
- {
- printf ("setcanceltype failed: %s\n", strerror (err));
- exit (1);
- }
- /* The following code is not standard compliant: the mutex functions
- must not be called with asynchronous cancellation enabled. */
-
- err = pthread_mutex_unlock (&m2);
- if (err != 0)
- {
- printf ("child: mutex_unlock failed: %s\n", strerror (err));
- exit (1);
- }
-
- err = pthread_mutex_lock (&m1);
- if (err != 0)
- {
- printf ("child: 1st mutex_lock failed: %s\n", strerror (err));
- exit (1);
- }
-
- /* We should never come here. */
-
- pthread_cleanup_pop (0);
-
- return NULL;
-}
-
-
-static int
-do_test (void)
-{
- int err;
- pthread_t th;
- int result = 0;
- void *retval;
-
- /* Get the mutexes. */
- err = pthread_mutex_lock (&m1);
- if (err != 0)
- {
- printf ("parent: 1st mutex_lock failed: %s\n", strerror (err));
- return 1;
- }
- err = pthread_mutex_lock (&m2);
- if (err != 0)
- {
- printf ("parent: 2nd mutex_lock failed: %s\n", strerror (err));
- return 1;
- }
-
- err = pthread_create (&th, NULL, tf, NULL);
- if (err != 0)
- {
- printf ("create failed: %s\n", strerror (err));
- return 1;
- }
-
- err = pthread_mutex_lock (&m2);
- if (err != 0)
- {
- printf ("parent: 3rd mutex_lock failed: %s\n", strerror (err));
- return 1;
- }
-
- err = pthread_cancel (th);
- if (err != 0)
- {
- printf ("cancel failed: %s\n", strerror (err));
- return 1;
- }
-
- err = pthread_join (th, &retval);
- if (err != 0)
- {
- printf ("join failed: %s\n", strerror (err));
- return 1;
- }
-
- if (retval != PTHREAD_CANCELED)
- {
- printf ("wrong return value: %p\n", retval);
- result = 1;
- }
-
- if (cntr == 42)
- {
- puts ("cleanup handler called with wrong argument");
- result = 1;
- }
- else if (cntr != 1)
- {
- puts ("cleanup handling not called");
- result = 1;
- }
-
- return result;
-}
-
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
More information about the uClibc-cvs
mailing list