From 434fb96be7fd9884e4f2f5be709f51149fc02de5 Mon Sep 17 00:00:00 2001 From: "roberto@oneiric64" Date: Wed, 8 Feb 2012 12:49:06 +0100 Subject: [PATCH] another fix in locking subsystem --- lock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lock.c b/lock.c index 2ca99ed1..438b5dfe 100644 --- a/lock.c +++ b/lock.c @@ -92,7 +92,7 @@ void uwsgi_rlock(struct uwsgi_lock_item *uli) { #ifdef OBSOLETE_LINUX_KERNEL uwsgi_lock(uli); #else - pthread_rwlock_rdlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_rwlockattr_t))); + pthread_rwlock_rdlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_mutexattr_t))); uli->pid = uwsgi.mypid; #endif } @@ -101,7 +101,7 @@ void uwsgi_wlock(struct uwsgi_lock_item *uli) { #ifdef OBSOLETE_LINUX_KERNEL uwsgi_lock(uli); #else - pthread_rwlock_wrlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_rwlockattr_t))); + pthread_rwlock_wrlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_mutexattr_t))); uli->pid = uwsgi.mypid; #endif } @@ -110,7 +110,7 @@ void uwsgi_rwunlock(struct uwsgi_lock_item *uli) { #ifdef OBSOLETE_LINUX_KERNEL uwsgi_unlock(uli); #else - pthread_rwlock_unlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_rwlockattr_t))); + pthread_rwlock_unlock((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_mutexattr_t))); uli->pid = 0; #endif } @@ -145,7 +145,7 @@ struct uwsgi_lock_item *uwsgi_rwlock_init(char *id) { exit(1); } - if (pthread_rwlock_init((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_rwlockattr_t)), (pthread_rwlockattr_t *) uli->lock_ptr)) { + if (pthread_rwlock_init((pthread_rwlock_t *) (uli->lock_ptr + sizeof(pthread_mutexattr_t)), (pthread_rwlockattr_t *) uli->lock_ptr)) { uwsgi_log("unable to initialize rwlock\n"); exit(1); }