From a46114ec01e8d174a41744f4f1b49905613847dc Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Mon, 20 Jun 2016 23:49:35 +0200 Subject: lib, irmd, ipcp: robust mutexes Update to POSIX 200112L to allow use of robust mutexes in the shm_du_map. Removed the implementation of the rw_lock in favor of pthread_rwlock_t. Placeholder for the shm_du_map_sanitize function. --- src/lib/rw_lock.c | 127 ------------------------------------------------------ 1 file changed, 127 deletions(-) delete mode 100644 src/lib/rw_lock.c (limited to 'src/lib/rw_lock.c') diff --git a/src/lib/rw_lock.c b/src/lib/rw_lock.c deleted file mode 100644 index ba285694..00000000 --- a/src/lib/rw_lock.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - * - * Read/Write locks - * - * Dimitri Staessens - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include - -int rw_lock_init(rw_lock_t * lock) -{ - if (lock == NULL) - return -1; - - pthread_mutex_init(&lock->lock, NULL); - pthread_mutex_init(&lock->i_lock, NULL); - lock->i = 0; - - return 0; -} - -void rw_lock_destroy(rw_lock_t * lock) -{ - if (lock == NULL) - return; - - pthread_mutex_destroy(&lock->lock); - pthread_mutex_destroy(&lock->i_lock); - lock->i = -1; -} - -int rw_lock_rdlock(rw_lock_t * lock) -{ - int ret = 0; - - if (lock == NULL) - return -1; - - pthread_mutex_lock(&lock->i_lock); - - if (lock->i < 0) { - pthread_mutex_unlock(&lock->i_lock); - return -1; - } - - if (lock->i == 0) - ret = pthread_mutex_lock(&lock->lock); - - ++(lock->i); - - pthread_mutex_unlock(&lock->i_lock); - - return ret; -} - -int rw_lock_wrlock(rw_lock_t * lock) -{ - int ret = 0; - - if (lock == NULL) - return -1; - - pthread_mutex_lock(&lock->i_lock); - - if (lock->i < 0) { - pthread_mutex_unlock(&lock->i_lock); - return -1; - } - - pthread_mutex_unlock(&lock->i_lock); - - while (1) { - pthread_mutex_lock(&lock->i_lock); - - if (lock->i == 0) { - ++(lock->i); - ret = pthread_mutex_lock(&lock->lock); - pthread_mutex_unlock(&lock->i_lock); - break; - } - - pthread_mutex_unlock(&lock->i_lock); - - sched_yield(); - } - - return ret; -} - -int rw_lock_unlock(rw_lock_t * lock) -{ - int ret = 0; - - if (lock == NULL) - return -1; - - pthread_mutex_lock(&lock->i_lock); - - if (lock->i < 0) { - pthread_mutex_unlock(&lock->i_lock); - return -1; - } - - --(lock->i); - - if (lock->i == 0) - ret = pthread_mutex_unlock(&lock->lock); - - pthread_mutex_unlock(&lock->i_lock); - - return ret; -} -- cgit v1.2.3