From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27100 invoked by alias); 5 Oct 2017 12:57:08 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 27016 invoked by uid 10080); 5 Oct 2017 12:57:08 -0000 Date: Thu, 05 Oct 2017 12:57:00 -0000 Message-ID: <20171005125708.27012.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] RTEMS: Make pthread_mutex_t self-contained X-Act-Checkin: newlib-cygwin X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 55c5dda9b5d2627ef7bb5568f11632c4c03bf41b X-Git-Newrev: 3a79700c2d994c635b2af053c8293d19f2e12bd5 X-SW-Source: 2017-q4/txt/msg00005.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3a79700c2d994c635b2af053c8293d19f2e12bd5 commit 3a79700c2d994c635b2af053c8293d19f2e12bd5 Author: Sebastian Huber Date: Wed Sep 27 14:20:14 2017 +0200 RTEMS: Make pthread_mutex_t self-contained Signed-off-by: Sebastian Huber Diff: --- newlib/libc/sys/rtems/include/sys/_pthreadtypes.h | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h b/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h index 0b607f7..b091ebb 100644 --- a/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h +++ b/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h @@ -131,9 +131,35 @@ typedef struct { #endif /* !defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES) */ -typedef __uint32_t pthread_mutex_t; /* identify a mutex */ +struct _Chain_Node { + struct _Chain_Node *_next; + struct _Chain_Node *_previous; +}; + +struct _RBTree_Node { + struct _RBTree_Node *_left; + struct _RBTree_Node *_right; + struct _RBTree_Node *_parent; + int _color; +}; + +struct _Priority_Node { + union { + struct _RBTree_Node _RBTree; + struct _Chain_Node _Chain; + } _Node; + __uint64_t _priority; +}; -#define _PTHREAD_MUTEX_INITIALIZER ((pthread_mutex_t) 0xFFFFFFFF) +typedef struct { + unsigned long _flags; + struct _Mutex_recursive_Control _Recursive; + struct _Priority_Node _Priority_ceiling; + const struct _Scheduler_Control *_scheduler; +} pthread_mutex_t; + +#define _PTHREAD_MUTEX_INITIALIZER \ + { 0, _MUTEX_RECURSIVE_INITIALIZER, { { 0, 0, 0, 0 }, 0 }, 0 } typedef struct { int is_initialized;