diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-14 06:12:59 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-02-02 15:01:23 +0100 |
| commit | 8ddd92d56ae7c30f086f69c8e2930b44c5a44f1c (patch) | |
| tree | 5b55169bc1b359243d6f2883aeb7d40649479c25 /cpukit/include | |
| parent | RFS: Use self-contained recursive mutex (diff) | |
| download | rtems-8ddd92d56ae7c30f086f69c8e2930b44c5a44f1c.tar.bz2 | |
pipe: Use self-contained mutex
Update #2843.
Diffstat (limited to 'cpukit/include')
| -rwxr-xr-x | cpukit/include/rtems/confdefs.h | 15 | ||||
| -rw-r--r-- | cpukit/include/rtems/pipe.h | 3 |
2 files changed, 3 insertions, 15 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 212b46cd42..0d00726812 100755 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -227,17 +227,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #define _CONFIGURE_BARRIERS_FOR_FIFOS 0 #endif -/* - * This specifies the number of semaphores required for the configured - * number of FIFOs and named pipes. - */ -#if CONFIGURE_MAXIMUM_FIFOS > 0 || CONFIGURE_MAXIMUM_PIPES > 0 - #define _CONFIGURE_SEMAPHORES_FOR_FIFOS \ - (1 + (CONFIGURE_MAXIMUM_FIFOS + CONFIGURE_MAXIMUM_PIPES)) -#else - #define _CONFIGURE_SEMAPHORES_FOR_FIFOS 0 -#endif - /** * @defgroup ConfigFilesystems Filesystems and Mount Table Configuration * @@ -445,9 +434,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; * This computes the number of semaphores required for the various * file systems including the FIFO plugin to the IMFS. */ -#define _CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS \ - (_CONFIGURE_SEMAPHORES_FOR_FIFOS + \ - _CONFIGURE_SEMAPHORES_FOR_NFS) +#define _CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS _CONFIGURE_SEMAPHORES_FOR_NFS #ifdef CONFIGURE_INIT diff --git a/cpukit/include/rtems/pipe.h b/cpukit/include/rtems/pipe.h index 7c6566ad50..a2df29c2c3 100644 --- a/cpukit/include/rtems/pipe.h +++ b/cpukit/include/rtems/pipe.h @@ -19,6 +19,7 @@ #define _RTEMS_PIPE_H #include <rtems/libio.h> +#include <rtems/thread.h> /** * @defgroup FIFO_PIPE FIFO/Pipe File System Support @@ -45,7 +46,7 @@ typedef struct pipe_control { unsigned int waitingWriters; unsigned int readerCounter; /* incremental counters */ unsigned int writerCounter; /* for differentiation of successive opens */ - rtems_id Semaphore; + rtems_mutex Mutex; rtems_id readBarrier; /* wait queues */ rtems_id writeBarrier; #if 0 |