libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #62 from rogerz/pthread-comments 

add comments to help understanding pthread
This commit is contained in:
Bernard Xiong 2013-03-29 05:46:32 -07:00
parent aaf0186852 e9cf10daed
commit 8bf1c5d61a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/pthreads/pthread.h
View File

@ -104,9 +104,9 @@ struct pthread_rwlock
pthread_cond_t rw_condreaders; /* for reader threads waiting */ pthread_cond_t rw_condreaders; /* for reader threads waiting */
pthread_cond_t rw_condwriters; /* for writer threads waiting */ pthread_cond_t rw_condwriters; /* for writer threads waiting */
int rw_nwaitreaders; /* the number waiting */ int rw_nwaitreaders; /* the number of reader threads waiting */
int rw_nwaitwriters; /* the number waiting */ int rw_nwaitwriters; /* the number of writer threads waiting */
int rw_refcount; int rw_refcount; /* 0: unlocked, -1: locked by writer, > 0 locked by n readers */
}; };
typedef struct pthread_rwlock pthread_rwlock_t; typedef struct pthread_rwlock pthread_rwlock_t;

12
components/pthreads/pthread_rwlock.c
View File

@ -112,9 +112,11 @@ int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0) while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0)
{ {
rwlock->rw_nwaitreaders++; rwlock->rw_nwaitreaders++;
/* rw_mutex will be released when waiting for rw_condreaders */
result = pthread_cond_wait(&rwlock->rw_condreaders, &rwlock->rw_mutex); result = pthread_cond_wait(&rwlock->rw_condreaders, &rwlock->rw_mutex);
/* rw_mutex should have been taken again when returned from waiting */
rwlock->rw_nwaitreaders--; rwlock->rw_nwaitreaders--;
if (result != 0) if (result != 0) /* wait error */
break; break;
} }
@ -160,7 +162,9 @@ int pthread_rwlock_timedrdlock (pthread_rwlock_t * rwlock, const struct timespec
while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0) while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0)
{ {
rwlock->rw_nwaitreaders++; rwlock->rw_nwaitreaders++;
/* rw_mutex will be released when waiting for rw_condreaders */
result = pthread_cond_timedwait(&rwlock->rw_condreaders, &rwlock->rw_mutex, abstime); result = pthread_cond_timedwait(&rwlock->rw_condreaders, &rwlock->rw_mutex, abstime);
/* rw_mutex should have been taken again when returned from waiting */
rwlock->rw_nwaitreaders--; rwlock->rw_nwaitreaders--;
if (result != 0) if (result != 0)
break; break;
@ -187,7 +191,9 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, const struct timespec
while (rwlock->rw_refcount != 0) while (rwlock->rw_refcount != 0)
{ {
rwlock->rw_nwaitwriters++; rwlock->rw_nwaitwriters++;
/* rw_mutex will be released when waiting for rw_condwriters */
result = pthread_cond_timedwait(&rwlock->rw_condwriters, &rwlock->rw_mutex, abstime); result = pthread_cond_timedwait(&rwlock->rw_condwriters, &rwlock->rw_mutex, abstime);
/* rw_mutex should have been taken again when returned from waiting */
rwlock->rw_nwaitwriters--; rwlock->rw_nwaitwriters--;
if (result != 0) break; if (result != 0) break;
@ -233,7 +239,7 @@ int pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
if (rwlock->rw_refcount > 0) if (rwlock->rw_refcount > 0)
rwlock->rw_refcount--; /* releasing a reader */ rwlock->rw_refcount--; /* releasing a reader */
else if (rwlock->rw_refcount == -1) else if (rwlock->rw_refcount == -1)
rwlock->rw_refcount = 0; /* releasing a reader */ rwlock->rw_refcount = 0; /* releasing a writer */
/* give preference to waiting writers over waiting readers */ /* give preference to waiting writers over waiting readers */
if (rwlock->rw_nwaitwriters > 0) if (rwlock->rw_nwaitwriters > 0)
@ -264,7 +270,9 @@ int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
while (rwlock->rw_refcount != 0) while (rwlock->rw_refcount != 0)
{ {
rwlock->rw_nwaitwriters++; rwlock->rw_nwaitwriters++;
/* rw_mutex will be released when waiting for rw_condwriters */
result = pthread_cond_wait(&rwlock->rw_condwriters, &rwlock->rw_mutex); result = pthread_cond_wait(&rwlock->rw_condwriters, &rwlock->rw_mutex);
/* rw_mutex should have been taken again when returned from waiting */
rwlock->rw_nwaitwriters--; rwlock->rw_nwaitwriters--;
if (result != 0) break; if (result != 0) break;