Changeset 8fe1cdb in mainline

Timestamp:

2006-04-01T15:20:20Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0319a8f6

Parents:

c4c5de5

Message:

Added support for multithreading (using futexes) into malloc.

Location:

libc

Files:

• include/futex.h (modified) (1 diff)
• malloc/malloc.c (modified) (2 diffs)

libc/include/futex.h

@@ -33 +33 @@
 #include <types.h>
 
+#define FUTEX_INITIALIZER     {1}
+
 extern void futex_initialize(atomic_t *futex, int value);
 extern int futex_down(atomic_t *futex);

libc/malloc/malloc.c

@@ -462 +462 @@
 #define ABORT_ON_ASSERT_FAILURE 1
 #define PROCEED_ON_ERROR 0
-#define USE_LOCKS 0
+#define USE_LOCKS 1
 #define INSECURE 0
 #define HAVE_MMAP 0
@@ -764 +764 @@
 */
 
-#ifndef WIN32
 /* By default use posix locks */
-#include <pthread.h>
-#define MLOCK_T pthread_mutex_t
-#define INITIAL_LOCK(l)      pthread_mutex_init(l, NULL)
-#define ACQUIRE_LOCK(l)      pthread_mutex_lock(l)
-#define RELEASE_LOCK(l)      pthread_mutex_unlock(l)
+#include <futex.h>
+#define MLOCK_T atomic_t
+#define INITIAL_LOCK(l)      futex_initialize(l, 1)
+/* futex_down cannot fail, but can return different
+ * retvals for OK
+ */
+#define ACQUIRE_LOCK(l)      ({futex_down(l);0;})
+#define RELEASE_LOCK(l)      futex_up(l)
 
 #if HAVE_MORECORE
-static MLOCK_T morecore_mutex = PTHREAD_MUTEX_INITIALIZER;
+static MLOCK_T morecore_mutex = FUTEX_INITIALIZER;
 #endif /* HAVE_MORECORE */
 
-static MLOCK_T magic_init_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#else /* WIN32 */
-/*
-   Because lock-protected regions have bounded times, and there
-   are no recursive lock calls, we can use simple spinlocks.
-*/
-
-#define MLOCK_T long
-static int win32_acquire_lock (MLOCK_T *sl) {
-  for (;;) {
-#ifdef InterlockedCompareExchangePointer
-    if (!InterlockedCompareExchange(sl, 1, 0))
-      return 0;
-#else  /* Use older void* version */
-    if (!InterlockedCompareExchange((void**)sl, (void*)1, (void*)0))
-      return 0;
-#endif /* InterlockedCompareExchangePointer */
-    Sleep (0);
-  }
-}
-
-static void win32_release_lock (MLOCK_T *sl) {
-  InterlockedExchange (sl, 0);
-}
-
-#define INITIAL_LOCK(l)      *(l)=0
-#define ACQUIRE_LOCK(l)      win32_acquire_lock(l)
-#define RELEASE_LOCK(l)      win32_release_lock(l)
-#if HAVE_MORECORE
-static MLOCK_T morecore_mutex;
-#endif /* HAVE_MORECORE */
-static MLOCK_T magic_init_mutex;
-#endif /* WIN32 */
+static MLOCK_T magic_init_mutex = FUTEX_INITIALIZER;
+
 
 #define USE_LOCK_BIT               (2U)