diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 00:05:21 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-27 23:00:09 +0100 |
| commit | 1d767442294df64b9746f02cd6fcf320da257b1f (patch) | |
| tree | 545058ea2a191721820a41b5c8b6101bc1f65064 /libnetfs | |
| parent | 1de0643c9218db536f5b2e294bbfa653c77438e4 (diff) | |
Complete switch from cthreads to pthreads
* console/input.c: Switch comment from cthreads to pthreads.
* libnetfs/file-get-fs-options.c: Likewise
* libnetfs/fsys-get-options.c: Likewise
* libnetfs/fsys-set-options.c: Likewise
* libnetfs/shutdown.c: Likewise
* libpager/lock-object.c: Likewise
* nfsd/cache.c: Set back replycachelock as static variable.
* term/hurdio.c: Use pthread_hurd_cond_wait_np instead of pthread_cond_wait.
Diffstat (limited to 'libnetfs')
| -rw-r--r-- | libnetfs/file-get-fs-options.c | 4 | ||||
| -rw-r--r-- | libnetfs/fsys-get-options.c | 4 | ||||
| -rw-r--r-- | libnetfs/fsys-set-options.c | 8 | ||||
| -rw-r--r-- | libnetfs/shutdown.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libnetfs/file-get-fs-options.c b/libnetfs/file-get-fs-options.c index 1a18c72d..a8029916 100644 --- a/libnetfs/file-get-fs-options.c +++ b/libnetfs/file-get-fs-options.c @@ -44,11 +44,11 @@ netfs_S_file_get_fs_options (struct protid *user, if (! err) { #if NOT_YET - rwlock_reader_lock (&netfs_fsys_lock); + pthread_rwlock_rdlock (&netfs_fsys_lock); #endif err = netfs_append_args (&argz, &argz_len); #if NOT_YET - rwlock_reader_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); #endif } diff --git a/libnetfs/fsys-get-options.c b/libnetfs/fsys-get-options.c index fa045eff..54bd9a00 100644 --- a/libnetfs/fsys-get-options.c +++ b/libnetfs/fsys-get-options.c @@ -49,11 +49,11 @@ netfs_S_fsys_get_options (fsys_t fsys, if (! err) { #if NOT_YET - rwlock_reader_lock (&netfs_fsys_lock); + pthread_rwlock_rdlock (&netfs_fsys_lock); #endif err = netfs_append_args (&argz, &argz_len); #if NOT_YET - rwlock_reader_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); #endif } diff --git a/libnetfs/fsys-set-options.c b/libnetfs/fsys-set-options.c index 9dd8b007..d7dc743b 100644 --- a/libnetfs/fsys-set-options.c +++ b/libnetfs/fsys-set-options.c @@ -70,20 +70,20 @@ netfs_S_fsys_set_options (fsys_t fsys, #if NOT_YET if (do_children) { - rwlock_writer_lock (&netfs_fsys_lock); + pthread_rwlock_wrlock (&netfs_fsys_lock); err = netfs_node_iterate (helper); - rwlock_writer_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); } #endif if (!err) { #if NOT_YET - rwlock_writer_lock (&netfs_fsys_lock); + pthread_rwlock_wrlock (&netfs_fsys_lock); #endif err = netfs_set_options (data, data_len); #if NOT_YET - rwlock_writer_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); #endif } diff --git a/libnetfs/shutdown.c b/libnetfs/shutdown.c index b3463bfc..94d4b207 100644 --- a/libnetfs/shutdown.c +++ b/libnetfs/shutdown.c @@ -70,7 +70,7 @@ netfs_shutdown (int flags) #endif #ifdef NOTYET - rwlock_writer_lock (&netfs_fsys_lock); + pthread_rwlock_wrlock (&netfs_fsys_lock); #endif /* Permit all current RPC's to finish, and then suspend any new ones. */ @@ -78,7 +78,7 @@ netfs_shutdown (int flags) if (err) { #ifdef NOTYET - rwlock_writer_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); #endif return err; } @@ -90,7 +90,7 @@ netfs_shutdown (int flags) ports_enable_class (netfs_protid_class); ports_resume_class_rpcs (netfs_protid_class); #ifdef NOTYET - rwlock_writer_unlock (&netfs_fsys_lock); + pthread_rwlock_unlock (&netfs_fsys_lock); #endif return EBUSY; } |