Loading...
pthreads/pthread_internals.h Libc-262 Libc-583
--- Libc/Libc-262/pthreads/pthread_internals.h
+++ Libc/Libc-583/pthreads/pthread_internals.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2000-2003, 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991  
  *              All Rights Reserved 
@@ -30,20 +52,20 @@
 #ifndef _POSIX_PTHREAD_INTERNALS_H
 #define _POSIX_PTHREAD_INTERNALS_H
 
+// suppress pthread_attr_t typedef in sys/signal.h
+#define _PTHREAD_ATTR_T
+struct _pthread_attr_t; /* forward reference */
+typedef struct _pthread_attr_t pthread_attr_t;
 
 #include <assert.h>
-#include <mach/port.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
+#include <mach/mach.h>
 #include <mach/mach_error.h>
-#include <mach/message.h>
-#include <mach/machine/vm_types.h>
-#include <mach/std_types.h>
-#include <mach/policy.h>
-#include <mach/sync.h>
-#include <mach/sync_policy.h>
-#include <mach/mach_traps.h>
-#include <mach/thread_switch.h>
-#include <mach/mach_host.h>
-#include <mach/mach.h>			/* For generic MACH support */
+#include <libkern/OSAtomic.h>
 
 
 #ifndef __POSIX_LIB__
@@ -51,31 +73,51 @@
 #endif
 
 #include "posix_sched.h"		/* For POSIX scheduling policy & parameter */
+#include <sys/queue.h>		/* For POSIX scheduling policy & parameter */
 #include "pthread_machdep.h"		/* Machine-dependent definitions. */
-
-extern kern_return_t syscall_thread_switch(mach_port_name_t, int, mach_msg_timeout_t);
-
+#include "pthread_spinlock.h"		/* spinlock definitions. */
+
+TAILQ_HEAD(__pthread_list, _pthread);
+extern struct __pthread_list __pthread_head;        /* head of list of open files */
+extern pthread_lock_t _pthread_list_lock;
+extern  size_t pthreadsize;
 /*
  * Compiled-in limits
  */
-#undef _POSIX_THREAD_KEYS_MAX
-#define _POSIX_THREAD_KEYS_MAX	      128
+#define _EXTERNAL_POSIX_THREAD_KEYS_MAX 512
+#define _INTERNAL_POSIX_THREAD_KEYS_MAX 256
+#define _INTERNAL_POSIX_THREAD_KEYS_END 768
 
 /*
  * Threads
  */
+#define MAXTHREADNAMESIZE	64
+#define _PTHREAD_T
 typedef struct _pthread
 {
 	long	       sig;	      /* Unique signature for this structure */
-	struct _pthread_handler_rec *cleanup_stack;
+	struct __darwin_pthread_handler_rec *__cleanup_stack;
 	pthread_lock_t lock;	      /* Used for internal mutex on structure */
-	int	       detached;
-	int	       inherit;
-	int	       policy;
+	uint32_t	detached:8,
+			inherit:8,
+			policy:8,
+			freeStackOnExit:1,
+			newstyle:1,
+			kernalloc:1,
+			schedset:1,
+			wqthread:1,
+			wqkillset:1,
+			pad:2;
+	size_t	       guardsize;	/* size in bytes to guard stack overflow */
+#if  !defined(__LP64__)
+	int	       pad0;		/* for backwards compatibility */
+#endif
 	struct sched_param param;
 	struct _pthread_mutex *mutexes;
 	struct _pthread *joiner;
-	int			pad1;
+#if !defined(__LP64__)
+	int		pad1;		/* for backwards compatibility */
+#endif
 	void           *exit_value;
 	semaphore_t    death;		/* pthread_join() uses this to wait for death's call */
 	mach_port_t    kernel_thread; /* kernel thread this thread is bound to */
@@ -83,121 +125,422 @@
         void	       *arg;	      /* Argment for thread start routine */
 	int	       cancel_state;  /* Whether thread can be cancelled */
 	int	       err_no;		/* thread-local errno */
-	void	       *tsd[_POSIX_THREAD_KEYS_MAX];  /* Thread specific data */
+	void	       *tsd[_EXTERNAL_POSIX_THREAD_KEYS_MAX + _INTERNAL_POSIX_THREAD_KEYS_MAX];  /* Thread specific data */
         void           *stackaddr;     /* Base of the stack (is aligned on vm_page_size boundary */
         size_t         stacksize;      /* Size of the stack (is a multiple of vm_page_size and >= PTHREAD_STACK_MIN) */
 	mach_port_t    reply_port;     /* Cached MiG reply port */
-        void           *cthread_self;  /* cthread_self() if somebody calls cthread_set_self() */
-        boolean_t      freeStackOnExit;/* Should we free the stack when we're done? */
+#if defined(__LP64__)
+        int		pad2;		/* for natural alignment */
+#endif
+	void           *cthread_self;  /* cthread_self() if somebody calls cthread_set_self() */
+	/* protected by list lock */
+	uint32_t 	childrun:1,
+			parentcheck:1,
+			childexit:1,
+			pad3:29;
+#if defined(__LP64__)
+	int		pad4;		/* for natural alignment */
+#endif
+	TAILQ_ENTRY(_pthread) plist;
+	void *	freeaddr;
+	size_t	freesize;
+	mach_port_t	joiner_notify;
+	char	pthread_name[MAXTHREADNAMESIZE];		/* including nulll the name */
+        int	max_tsd_key;
+	void *	cur_workq;
+	void * cur_workitem;
+	uint64_t thread_id;
 } *pthread_t;
 
+/*
+ * This will cause a compile-time failure if someone moved the tsd field
+ * and we need to change _PTHREAD_TSD_OFFSET in pthread_machdep.h
+ */
+typedef char _need_to_change_PTHREAD_TSD_OFFSET[(_PTHREAD_TSD_OFFSET == offsetof(struct _pthread, tsd[0])) ? 0 : -1] ;
 
 /*
  * Thread attributes
  */
-typedef struct 
+struct _pthread_attr_t
 {
 	long	       sig;	      /* Unique signature for this structure */
-	pthread_lock_t lock;	      /* Used for internal mutex on structure */
-	int	       detached;
-	int	       inherit;
-	int	       policy;
+	pthread_lock_t lock;
+	uint32_t	detached:8,
+			inherit:8,
+			policy:8,
+			freeStackOnExit:1,
+			fastpath:1,
+			schedset:1,
+			reserved1:5;
+	size_t	       guardsize;	/* size in bytes to guard stack overflow */
+	int      reserved2; 	/* Should we free the stack when we exit? */
 	struct sched_param param;
         void           *stackaddr;     /* Base of the stack (is aligned on vm_page_size boundary */
         size_t         stacksize;      /* Size of the stack (is a multiple of vm_page_size and >= PTHREAD_STACK_MIN) */
-	boolean_t      freeStackOnExit;/* Should we free the stack when we exit? */
-} pthread_attr_t;
+	boolean_t	reserved3;
+};
 
 /*
  * Mutex attributes
  */
+#define _PTHREAD_MUTEX_POLICY_NONE		0
+#define _PTHREAD_MUTEX_POLICY_FAIRSHARE		1
+#define _PTHREAD_MUTEX_POLICY_FIRSTFIT		2
+#define _PTHREAD_MUTEX_POLICY_REALTIME		3
+#define _PTHREAD_MUTEX_POLICY_ADAPTIVE		4
+#define _PTHREAD_MUTEX_POLICY_PRIPROTECT	5
+#define _PTHREAD_MUTEX_POLICY_PRIINHERIT	6
+
+#define _PTHREAD_MUTEXATTR_T
 typedef struct 
 {
 	long sig;		     /* Unique signature for this structure */
 	int prioceiling;
-	u_int32_t protocol:2,		/* protocol attribute */
+	uint32_t protocol:2,		/* protocol attribute */
 		type:2,			/* mutex type */
-		rfu:28;
+		pshared:2,
+		policy:3,
+		rfu:23;
 } pthread_mutexattr_t;
 
 /*
  * Mutex variables
  */
+struct _pthread_mutex_options {
+	uint32_t  protocol:2,		/* protocol */
+		type:2,			/* mutex type */
+		pshared:2,			/* mutex type */
+		policy:3,
+		hold:2,
+		misalign:1,		/* 8 byte aligned? */
+		rfu:4,
+		lock_count:16;
+};
+
+
+#define _PTHREAD_MTX_OPT_PSHARED 0x010
+#define _PTHREAD_MTX_OPT_HOLD 0x200
+#define _PTHREAD_MTX_OPT_NOHOLD 0x400
+#define _PTHREAD_MTX_OPT_LASTDROP (_PTHREAD_MTX_OPT_NOHOLD | _PTHREAD_MTX_OPT_HOLD)
+
+
+#define _PTHREAD_MUTEX_T
 typedef struct _pthread_mutex
 {
 	long	       sig;	      /* Unique signature for this structure */
 	pthread_lock_t lock;	      /* Used for internal mutex on structure */
-	int	       waiters:30,      /* Count of threads waiting for this mutex */
-			def:1,
-			cond_lock:1;	/* Is there a condition locking me? */
+	union {
+		uint32_t value;
+		struct _pthread_mutex_options options;
+	} mtxopts;
+	int16_t       prioceiling;
+	int16_t	       priority;      /* Priority to restore when mutex unlocked */
+	uint32_t      waiters;       /* Count of threads waiting for this mutex */
 	pthread_t      owner;	      /* Which thread has this mutex locked */
-	mach_port_t    sem;	      /* Semaphore used for waiting */
-	u_int32_t	 protocol:2,		/* protocol */
-		type:2,			/* mutex type */
-		rfu:12,
-		lock_count:16;
 	struct _pthread_mutex *next, *prev;  /* List of other mutexes he owns */
 	struct _pthread_cond *busy;   /* List of condition variables using this mutex */
-	int	       prioceiling;
-	int	       priority;      /* Priority to restore when mutex unlocked */
+	semaphore_t    sem;	      /* Semaphore used for waiting */
+	semaphore_t	order;
 } pthread_mutex_t;
 
+
+typedef struct _npthread_mutex
+{
+/* keep same as pthread_mutex_t from here to .. */
+	long	       sig;	      /* Unique signature for this structure */
+	pthread_lock_t lock;	      /* Used for static init sequencing */
+	union {
+		uint32_t value;
+		struct _pthread_mutex_options options;
+	} mtxopts;
+	int16_t       prioceiling;
+	int16_t	       priority;      /* Priority to restore when mutex unlocked */
+	uint32_t	m_seq[3];
+#if  defined(__LP64__)
+	uint64_t      m_tid;	      /* Which thread has this mutex locked */
+	uint32_t  *	m_lseqaddr;
+	uint32_t  *	m_useqaddr;
+	uint32_t 	reserved[2];
+#else
+	uint32_t  *	m_lseqaddr;
+	uint64_t      m_tid;	      /* Which thread has this mutex locked */
+	uint32_t  *	m_useqaddr;
+#endif
+} npthread_mutex_t;
+
+
+
+
 /*
  * Condition variable attributes
  */
+#define _PTHREAD_CONDATTR_T
 typedef struct 
 {
 	long	       sig;	     /* Unique signature for this structure */
-	int unsupported;
+	uint32_t	 pshared:2,		/* pshared */
+		unsupported:30;
 } pthread_condattr_t;
 
 /*
  * Condition variables
  */
+#define _PTHREAD_COND_T
 typedef struct _pthread_cond
 {
 	long	       sig;	     /* Unique signature for this structure */
 	pthread_lock_t lock;	     /* Used for internal mutex on structure */
-	mach_port_t    sem;	     /* Kernel semaphore */
+	uint32_t	waiters:15,	/* Number of threads waiting */
+		   sigspending:15,	/* Number of outstanding signals */
+			pshared:2;
 	struct _pthread_cond *next, *prev;  /* List of condition variables using mutex */
 	struct _pthread_mutex *busy; /* mutex associated with variable */
-	int	       waiters:16,	/* Number of threads waiting */
-		   sigspending:16;	/* Number of outstanding signals */
+	semaphore_t    sem;	     /* Kernel semaphore */
 } pthread_cond_t;
 
+
+typedef struct _npthread_cond
+{
+	long	       sig;	     /* Unique signature for this structure */
+	pthread_lock_t lock;	     /* Used for internal mutex on structure */
+	uint32_t	rfu:29,		/* not in use*/
+			misalign: 1,	/* structure is not aligned to 8 byte boundary */
+			pshared:2;
+	struct _npthread_mutex *busy; /* mutex associated with variable */
+	uint32_t 	c_seq[3];
+#if defined(__LP64__)
+	uint32_t	reserved[3];
+#endif /* __LP64__ */
+} npthread_cond_t;
+
 /*
  * Initialization control (once) variables
  */
+#define _PTHREAD_ONCE_T
 typedef struct 
 {
 	long	       sig;	      /* Unique signature for this structure */
 	pthread_lock_t lock;	      /* Used for internal mutex on structure */
 } pthread_once_t;
 
+#define _PTHREAD_RWLOCKATTR_T
 typedef struct {
 	long	       sig;	      /* Unique signature for this structure */
 	int             pshared;
 	int		rfu[2];		/* reserved for future use */
 } pthread_rwlockattr_t;
 
+#define _PTHREAD_RWLOCK_T
 typedef struct {
 	long 		sig;
-        pthread_mutex_t lock;   /* monitor lock */
+	pthread_mutex_t lock;   /* monitor lock */
 	int             state;
 	pthread_cond_t  read_signal;
 	pthread_cond_t  write_signal;
 	int             blocked_writers;
-	int             pshared;
-	int		rfu[3];
+	int 		reserved;
+	pthread_t	owner;
+	int	rfu[1];
+	int 		pshared;
 } pthread_rwlock_t;
 
+#define _PTHREAD_RWLOCK_T
+typedef struct {
+	long 		sig;
+	pthread_lock_t lock;
+#if defined(__LP64__)
+	int 		reserv;
+	volatile uint32_t	rw_seq[4];
+	pthread_t	rw_owner;
+#else /* __LP64__ */
+	volatile uint32_t	rw_seq[4];
+	pthread_t	rw_owner;
+	int 		reserv;
+#endif /* __LP64__ */
+	volatile uint32_t *	rw_lseqaddr;
+	volatile uint32_t *	rw_wcaddr;
+	volatile uint32_t *	rw_useqaddr;
+	uint32_t        rw_flags;
+	int		misalign;
+#if defined(__LP64__)
+	uint32_t	rfu[31];
+#else /* __LP64__ */
+	uint32_t	rfu[18];
+#endif /* __LP64__ */
+	int 		pshared;
+} npthread_rwlock_t;
+
+/* flags for rw_flags */
+#define PTHRW_KERN_PROCESS_SHARED	0x10
+#define PTHRW_KERN_PROCESS_PRIVATE	0x20
+#define PTHRW_KERN_PROCESS_FLAGS_MASK	0x30
+
+#define PTHRW_EBIT      0x01
+#define PTHRW_LBIT      0x02
+#define PTHRW_YBIT      0x04
+#define PTHRW_WBIT      0x08
+#define PTHRW_UBIT      0x10
+#define PTHRW_RETRYBIT      0x20
+#define PTHRW_SHADOW_W      0x20	/* same as 0x20, shadow W bit for rwlock */
+
+#define PTHRW_TRYLKBIT      0x40
+#define PTHRW_RW_HUNLOCK      0x40	/* readers responsible for handling unlock */
+
+#define PTHRW_MTX_NONE      0x80
+#define PTHRW_RW_INIT       0x80    /* reset on the lock bits */
+#define PTHRW_RW_SPURIOUS     0x80	/* same as 0x80, spurious rwlock  unlock ret from kernel */
+
+#define PTHRW_INC	0x100
+#define PTHRW_BIT_MASK	0x000000ff
+#define PTHRW_UN_BIT_MASK 0x000000df	/* remove shadow bit */
+
+#define PTHRW_COUNT_SHIFT	8 
+#define PTHRW_COUNT_MASK 	0xffffff00
+#define PTHRW_MAX_READERS 	0xffffff00
+
+
+#define PTHREAD_MTX_TID_SWITCHING (uint64_t)-1
+
+#define is_rw_ewubit_set(x) (((x) & (PTHRW_EBIT | PTHRW_WBIT | PTHRW_UBIT)) != 0)
+#define is_rw_lbit_set(x) (((x) & PTHRW_LBIT) != 0)
+#define is_rw_lybit_set(x) (((x) & (PTHRW_LBIT | PTHRW_YBIT)) != 0)
+#define is_rw_ebit_set(x) (((x) & PTHRW_EBIT) != 0)
+#define is_rw_ebit_clear(x) (((x) & PTHRW_EBIT) == 0)
+#define is_rw_uebit_set(x) (((x) & (PTHRW_EBIT | PTHRW_UBIT)) != 0)
+#define is_rw_ewuybit_set(x) (((x) & (PTHRW_EBIT | PTHRW_WBIT | PTHRW_UBIT | PTHRW_YBIT)) != 0)
+#define is_rw_ewuybit_clear(x) (((x) & (PTHRW_EBIT | PTHRW_WBIT | PTHRW_UBIT | PTHRW_YBIT)) == 0)
+#define is_rw_ewubit_set(x) (((x) & (PTHRW_EBIT | PTHRW_WBIT | PTHRW_UBIT)) != 0)
+#define is_rw_ewubit_clear(x) (((x) & (PTHRW_EBIT | PTHRW_WBIT | PTHRW_UBIT)) == 0)
+
+/* is x lower than Y */
+#define is_seqlower(x, y) ((x  < y) || ((x - y) > (PTHRW_MAX_READERS/2)))
+/* is x lower than or eq Y */
+#define is_seqlower_eq(x, y) ((x  <= y) || ((x - y) > (PTHRW_MAX_READERS/2)))
+
+/* is x greater than Y */
+#define is_seqhigher(x, y) ((x  > y) || ((y - x) > (PTHRW_MAX_READERS/2)))
+
+static inline  int diff_genseq(uint32_t x, uint32_t y) {
+        if (x > y)  {
+                return(x-y);
+        } else {
+                return((PTHRW_MAX_READERS - y) + x +1);
+        }
+}
+
+/* keep the size to 64bytes  for both 64 and 32 */
+#define _PTHREAD_WORKQUEUE_ATTR_T
+typedef struct {
+	uint32_t sig;
+	int queueprio;
+	int overcommit;
+	unsigned int resv2[13];
+} pthread_workqueue_attr_t;
+
+#define _PTHREAD_WORKITEM_T
+typedef struct _pthread_workitem {
+	TAILQ_ENTRY(_pthread_workitem) item_entry;	/* pthread_workitem list in prio */
+	void	(*func)(void *);
+	void	* func_arg;
+	struct _pthread_workqueue *  workq;	
+	unsigned int	flags;
+	unsigned int	gencount;
+}  * pthread_workitem_t;
+
+#define PTH_WQITEM_INKERNEL_QUEUE 	1
+#define PTH_WQITEM_RUNNING		2
+#define PTH_WQITEM_COMPLETED 		4
+#define PTH_WQITEM_REMOVED 		8
+#define PTH_WQITEM_BARRIER 		0x10
+#define PTH_WQITEM_DESTROY 		0x20
+#define PTH_WQITEM_NOTINLIST 		0x40
+#define PTH_WQITEM_APPLIED 		0x80
+#define PTH_WQITEM_KERN_COUNT 		0x100
+
+#define WORKITEM_POOL_SIZE 1000
+TAILQ_HEAD(__pthread_workitem_pool, _pthread_workitem);
+extern struct __pthread_workitem_pool __pthread_workitem_pool_head;        /* head list of workitem pool  */
+
+#define WQ_NUM_PRIO_QS	3	/* WORKQ_HIGH/DEFAULT/LOW_PRIOQUEUE */
+
+#define _PTHREAD_WORKQUEUE_HEAD_T
+typedef struct  _pthread_workqueue_head {
+	TAILQ_HEAD(, _pthread_workqueue) wqhead;
+	struct _pthread_workqueue * next_workq;	
+} * pthread_workqueue_head_t;
+
+
+#define _PTHREAD_WORKQUEUE_T
+typedef struct  _pthread_workqueue {
+	unsigned int       sig;	      /* Unique signature for this structure */
+	pthread_lock_t lock;	      /* Used for internal mutex on structure */
+	TAILQ_ENTRY(_pthread_workqueue) wq_list;	/* workqueue list in prio */
+	TAILQ_HEAD(, _pthread_workitem) item_listhead;	/* pthread_workitem list in prio */
+	TAILQ_HEAD(, _pthread_workitem) item_kernhead;	/* pthread_workitem list in prio */
+	unsigned int	flags;
+	size_t		stacksize;
+	int		istimeshare;
+	int 		importance;
+	int 		affinity;
+	int		queueprio;
+	int		barrier_count;
+	int		kq_count;
+	void		(*term_callback)(struct _pthread_workqueue *,void *);
+	void  * term_callarg;
+	pthread_workqueue_head_t headp;
+	int		overcommit;
+#if defined(__ppc64__) || defined(__x86_64__)
+	unsigned int	rev2[2];
+#else
+	unsigned int	rev2[12];
+#endif
+}  * pthread_workqueue_t;
+
+#define	 PTHREAD_WORKQ_IN_CREATION	1
+#define	 PTHREAD_WORKQ_IN_TERMINATE	2
+#define	 PTHREAD_WORKQ_BARRIER_ON	4
+#define	 PTHREAD_WORKQ_TERM_ON		8
+#define	 PTHREAD_WORKQ_DESTROYED	0x10
+#define	 PTHREAD_WORKQ_REQUEUED		0x20
+#define	 PTHREAD_WORKQ_SUSPEND		0x40
+
+#define WORKQUEUE_POOL_SIZE 100
+TAILQ_HEAD(__pthread_workqueue_pool, _pthread_workqueue);
+extern struct __pthread_workqueue_pool __pthread_workqueue_pool_head;        /* head list of workqueue pool  */
+
 #include "pthread.h"
+
+#if defined(__i386__) || defined(__ppc64__) || defined(__x86_64__) || (defined(__arm__) && (defined(_ARM_ARCH_7) || !defined(_ARM_ARCH_6) || !defined(__thumb__)))
+/*
+ * Inside libSystem, we can use r13 or %gs directly to get access to the
+ * thread-specific data area. The current thread is in the first slot.
+ */
+inline static pthread_t __attribute__((__pure__))
+_pthread_self_direct(void)
+{
+       pthread_t ret;
+#if defined(__i386__) || defined(__x86_64__)
+       asm("mov %%gs:%P1, %0" : "=r" (ret) : "i" (offsetof(struct _pthread, tsd[0])));
+#elif defined(__ppc64__)
+	register const pthread_t __pthread_self asm ("r13");
+	ret = __pthread_self;
+#elif defined(__arm__) && defined(_ARM_ARCH_6)
+	__asm__ ("mrc p15, 0, %0, c13, c0, 3" : "=r"(ret));
+#elif defined(__arm__) && !defined(_ARM_ARCH_6)
+	register const pthread_t __pthread_self asm ("r9");
+	ret = __pthread_self;
+#endif
+       return ret;
+}
+#define pthread_self() _pthread_self_direct()
+#endif
 
 #define _PTHREAD_DEFAULT_INHERITSCHED	PTHREAD_INHERIT_SCHED
 #define _PTHREAD_DEFAULT_PROTOCOL	PTHREAD_PRIO_NONE
 #define _PTHREAD_DEFAULT_PRIOCEILING	0
 #define _PTHREAD_DEFAULT_POLICY		SCHED_OTHER
 #define _PTHREAD_DEFAULT_STACKSIZE	0x80000	  /* 512K */
+#define _PTHREAD_DEFAULT_PSHARED	PTHREAD_PROCESS_PRIVATE
 
 #define _PTHREAD_NO_SIG			0x00000000
 #define _PTHREAD_MUTEX_ATTR_SIG		0x4D545841  /* 'MTXA' */
@@ -214,47 +557,29 @@
 #define _PTHREAD_RWLOCK_SIG		0x52574C4B  /* 'RWLK' */
 #define _PTHREAD_RWLOCK_SIG_init	0x2DA8B3B4  /* [almost] ~'RWLK' */
 
-#define _PTHREAD_CREATE_PARENT	     4
-#define _PTHREAD_EXITED		     8
-
-#define _PTHREAD_CANCEL_STATE_MASK   0xFE
-#define _PTHREAD_CANCEL_TYPE_MASK    0xFD
+
+#define _PTHREAD_KERN_COND_SIG		0x12345678  /*  */
+#define _PTHREAD_KERN_MUTEX_SIG		0x34567812  /*  */
+#define _PTHREAD_KERN_RWLOCK_SIG	0x56781234  /*  */
+
+#define _PTHREAD_CREATE_PARENT		4
+#define _PTHREAD_EXITED			8
+// 4597450: begin
+#define _PTHREAD_WASCANCEL		0x10
+// 4597450: end
+
+#if defined(DEBUG)
+#define _PTHREAD_MUTEX_OWNER_SELF	pthread_self()
+#else
+#define _PTHREAD_MUTEX_OWNER_SELF	(pthread_t)0x12141968
+#endif
+#define _PTHREAD_MUTEX_OWNER_SWITCHING	(pthread_t)(~0)
+
+#define _PTHREAD_CANCEL_STATE_MASK   0x01
+#define _PTHREAD_CANCEL_TYPE_MASK    0x02
 #define _PTHREAD_CANCEL_PENDING	     0x10  /* pthread_cancel() has been called for this thread */
 
 extern boolean_t swtch_pri(int);
-
-/* Number of times to spin when the lock is unavailable and we are on a
-   multiprocessor.  On a uniprocessor we yield the processor immediately.  */
-#define	MP_SPIN_TRIES	1000
-extern int _spin_tries;
-extern int __is_threaded;
-extern int _cpu_has_altivec;
-
-/* Internal mutex locks for data structures */
-#define TRY_LOCK(v) (!__is_threaded || _spin_lock_try((pthread_lock_t *)&(v)))
-#define LOCK(v)																\
-do {																		\
-	if (__is_threaded) {													\
-		int		tries = _spin_tries;										\
-																			\
-		while (!_spin_lock_try((pthread_lock_t *)&(v))) {					\
-			if (tries-- > 0)												\
-				continue;													\
-																			\
-			syscall_thread_switch(THREAD_NULL, SWITCH_OPTION_DEPRESS, 1);	\
-			tries = _spin_tries;											\
-		}																	\
-	}																		\
-} while (0)
-#define UNLOCK(v)								\
-do {											\
-	if (__is_threaded)							\
-		_spin_unlock((pthread_lock_t *)&(v));	\
-} while (0)
-
-#ifndef ESUCCESS
-#define ESUCCESS 0
-#endif
 
 #ifndef PTHREAD_MACH_CALL
 #define	PTHREAD_MACH_CALL(expr, ret) (ret) = (expr)
@@ -265,13 +590,35 @@
 /* Functions defined in machine-dependent files. */
 extern vm_address_t _sp(void);
 extern vm_address_t _adjust_sp(vm_address_t sp);
-extern void _spin_lock(pthread_lock_t *lockp);
-extern int  _spin_lock_try(pthread_lock_t *lockp);
-extern void _spin_unlock(pthread_lock_t *lockp);
 extern void _pthread_setup(pthread_t th, void (*f)(pthread_t), void *sp, int suspended, int needresume);
 
 extern void _pthread_tsd_cleanup(pthread_t self);
+
+#if  defined(__i386__) || defined(__x86_64__)
+__private_extern__ void __mtx_holdlock(npthread_mutex_t *mutex, uint32_t diff, uint32_t * flagp, uint32_t ** pmtxp, uint32_t * mgenp, uint32_t * ugenp);
+__private_extern__ int __mtx_droplock(npthread_mutex_t *mutex, int count, uint32_t * flagp, uint32_t ** pmtxp, uint32_t * mgenp, uint32_t * ugenp, uint32_t * notifyp);
+__private_extern__ int __mtx_updatebits(npthread_mutex_t *mutex, uint32_t updateval, int firstfiti, int fromcond);
+
+/* syscall interfaces */
+extern uint32_t __psynch_mutexwait(pthread_mutex_t * mutex,  uint32_t mgen, uint32_t  ugen, uint64_t tid, uint32_t flags);
+extern uint32_t __psynch_mutexdrop(pthread_mutex_t * mutex,  uint32_t mgen, uint32_t  ugen, uint64_t tid, uint32_t flags);
+extern int __psynch_cvbroad(pthread_cond_t * cv, uint32_t cvgen, uint32_t diffgen, pthread_mutex_t * mutex,  uint32_t mgen, uint32_t ugen, uint64_t tid, uint32_t flags);
+extern int __psynch_cvsignal(pthread_cond_t * cv, uint32_t cvgen, uint32_t cvugen, pthread_mutex_t * mutex,  uint32_t mgen, uint32_t ugen, int thread_port, uint32_t flags);
+extern uint32_t __psynch_cvwait(pthread_cond_t * cv, uint32_t cvgen, uint32_t cvugen, pthread_mutex_t * mutex,  uint32_t mgen, uint32_t ugen, uint64_t sec, uint64_t usec);
+extern uint32_t __psynch_rw_longrdlock(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_yieldwrlock(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern int __psynch_rw_downgrade(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_upgrade(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_rdlock(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_wrlock(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_unlock(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+extern uint32_t __psynch_rw_unlock2(pthread_rwlock_t * rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags);
+#endif /* __i386__ || __x86_64__ */
 
 __private_extern__ semaphore_t new_sem_from_pool(void);
 __private_extern__ void restore_sem_to_pool(semaphore_t);
+__private_extern__ void _pthread_atfork_queue_init(void);
+int _pthread_lookup_thread(pthread_t thread, mach_port_t * port, int only_joinable);
+int _pthread_join_cleanup(pthread_t thread, void ** value_ptr, int conforming);
+
 #endif /* _POSIX_PTHREAD_INTERNALS_H */