From 1de0643c9218db536f5b2e294bbfa653c77438e4 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Tue, 4 Sep 2012 00:33:09 +0200 Subject: Switch from cthreads to pthreads Makefiles, headers, types, macros and function calls are renamed where appropriate. Most of this work was done by Barry deFreese and Thomas DiModica. * auth/Makefile: Switch from cthreads to pthreads. * auth/auth.c: Likewise. * boot/Makefile: Likewise. * boot/boot.c: Likewise. * boot/ux.c: Likewise. * console-client/Makefile: Likewise. * console-client/console.c: Likewise. * console-client/driver.c: Likewise. * console-client/driver.h: Likewise. * console-client/generic-speaker.c: Likewise. * console-client/kbd-repeat.c: Likewise. * console-client/ncursesw.c: Likewise. * console-client/pc-kbd.c: Likewise. * console-client/pc-mouse.c: Likewise. * console-client/timer.c: Likewise. * console-client/trans.c: Likewise. * console-client/vga.c: Likewise. * console/Makefile: Likewise. * console/console.c: Likewise. * console/display.c: Likewise. * console/input.c: Likewise. * console/pager.c: Likewise. * defpager/backing.c: Likewise. * exec/Makefile: Likewise. * exec/exec.c: Likewise. * exec/hashexec.c: Likewise. * exec/priv.h: Likewise. * ext2fs/Makefile: Likewise. * ext2fs/balloc.c: Likewise. * ext2fs/dir.c: Likewise. * ext2fs/ext2fs.c: Likewise. * ext2fs/ext2fs.h: Likewise. * ext2fs/ialloc.c: Likewise. * ext2fs/inode.c: Likewise. * ext2fs/msg.c: Likewise. * ext2fs/pager.c: Likewise. * ext2fs/pokel.c: Likewise. * ext2fs/storeinfo.c: Likewise. * ext2fs/truncate.c: Likewise. * fatfs/Makefile: Likewise. * fatfs/dir.c: Likewise. * fatfs/fat.c: Likewise. * fatfs/fatfs.h: Likewise. * fatfs/inode.c: Likewise. * fatfs/main.c: Likewise. * fatfs/pager.c: Likewise. * fatfs/virt-inode.c: Likewise. * ftpfs/Makefile: Likewise. * ftpfs/ccache.c: Likewise. * ftpfs/ccache.h: Likewise. * ftpfs/conn.c: Likewise. * ftpfs/dir.c: Likewise. * ftpfs/fs.c: Likewise. * ftpfs/ftpfs.c: Likewise. * ftpfs/ftpfs.h: Likewise. * ftpfs/ncache.c: Likewise. * ftpfs/netfs.c: Likewise. * ftpfs/node.c: Likewise. * hostmux/Makefile: Likewise. * hostmux/hostmux.h: Likewise. * hostmux/mux.c: Likewise. * hostmux/node.c: Likewise. * hostmux/stubs.c: Likewise. * hurd/shared.h: Likewise. * isofs/Makefile: Likewise. * isofs/inode.c: Likewise. * isofs/lookup.c: Likewise. * isofs/main.c: Likewise. * isofs/pager.c: Likewise. * libcons/Makefile: Likewise. * libcons/cons-switch.c: Likewise. * libcons/cons.h: Likewise. * libcons/dir-changed.c: Likewise. * libcons/file-changed.c: Likewise. * libcons/init-init.c: Likewise. * libcons/vcons-close.c: Likewise. * libcons/vcons-input.c: Likewise. * libcons/vcons-move-mouse.c: Likewise. * libcons/vcons-open.c: Likewise. * libcons/vcons-scrollback.c: Likewise. * libdiskfs/Makefile: Likewise. * libdiskfs/boot-start.c: Likewise. * libdiskfs/dead-name.c: Likewise. * libdiskfs/dir-chg.c: Likewise. * libdiskfs/dir-link.c: Likewise. * libdiskfs/dir-lookup.c: Likewise. * libdiskfs/dir-mkdir.c: Likewise. * libdiskfs/dir-mkfile.c: Likewise. * libdiskfs/dir-readdir.c: Likewise. * libdiskfs/dir-rename.c: Likewise. * libdiskfs/dir-renamed.c: Likewise. * libdiskfs/dir-rmdir.c: Likewise. * libdiskfs/dir-unlink.c: Likewise. * libdiskfs/disk-pager.c: Likewise. * libdiskfs/diskfs-pager.h: Likewise. * libdiskfs/diskfs.h: Likewise. * libdiskfs/file-access.c: Likewise. * libdiskfs/file-chg.c: Likewise. * libdiskfs/file-exec.c: Likewise. * libdiskfs/file-get-fs-opts.c: Likewise. * libdiskfs/file-get-trans.c: Likewise. * libdiskfs/file-get-transcntl.c: Likewise. * libdiskfs/file-getcontrol.c: Likewise. * libdiskfs/file-getfh.c: Likewise. * libdiskfs/file-lock-stat.c: Likewise. * libdiskfs/file-lock.c: Likewise. * libdiskfs/file-reparent.c: Likewise. * libdiskfs/file-set-trans.c: Likewise. * libdiskfs/file-sync.c: Likewise. * libdiskfs/file-syncfs.c: Likewise. * libdiskfs/fsys-getroot.c: Likewise. * libdiskfs/fsys-options.c: Likewise. * libdiskfs/fsys-syncfs.c: Likewise. * libdiskfs/ifsock.c: Likewise. * libdiskfs/init-first.c: Likewise. * libdiskfs/init-init.c: Likewise. * libdiskfs/init-startup.c: Likewise. * libdiskfs/io-duplicate.c: Likewise. * libdiskfs/io-get-conch.c: Likewise. * libdiskfs/io-identity.c: Likewise. * libdiskfs/io-map-cntl.c: Likewise. * libdiskfs/io-map.c: Likewise. * libdiskfs/io-modes-get.c: Likewise. * libdiskfs/io-modes-off.c: Likewise. * libdiskfs/io-modes-on.c: Likewise. * libdiskfs/io-modes-set.c: Likewise. * libdiskfs/io-owner-get.c: Likewise. * libdiskfs/io-owner-mod.c: Likewise. * libdiskfs/io-prenotify.c: Likewise. * libdiskfs/io-read.c: Likewise. * libdiskfs/io-readable.c: Likewise. * libdiskfs/io-reauthenticate.c: Likewise. * libdiskfs/io-rel-conch.c: Likewise. * libdiskfs/io-restrict-auth.c: Likewise. * libdiskfs/io-revoke.c: Likewise. * libdiskfs/io-seek.c: Likewise. * libdiskfs/io-sigio.c: Likewise. * libdiskfs/io-stat.c: Likewise. * libdiskfs/io-write.c: Likewise. * libdiskfs/lookup.c: Likewise. * libdiskfs/name-cache.c: Likewise. * libdiskfs/node-drop.c: Likewise. * libdiskfs/node-make.c: Likewise. * libdiskfs/node-nput.c: Likewise. * libdiskfs/node-nputl.c: Likewise. * libdiskfs/node-nref.c: Likewise. * libdiskfs/node-nrefl.c: Likewise. * libdiskfs/node-nrele.c: Likewise. * libdiskfs/node-nrelel.c: Likewise. * libdiskfs/peropen-rele.c: Likewise. * libdiskfs/priv.h: Likewise. * libdiskfs/shutdown.c: Likewise. * libdiskfs/sync-interval.c: Likewise. * libfshelp/Makefile: Likewise. * libfshelp/fetch-root.c: Likewise. * libfshelp/fshelp.h: Likewise. * libfshelp/get-identity.c: Likewise. * libfshelp/lock-acquire.c: Likewise. * libfshelp/lock-init.c: Likewise. * libfshelp/locks.h: Likewise. * libfshelp/set-active.c: Likewise. * libfshelp/trans.h: Likewise. * libfshelp/transbox-init.c: Likewise. * libiohelp/Makefile: Likewise. * libiohelp/get_conch.c: Likewise. * libiohelp/handle_io_release_conch.c: Likewise. * libiohelp/initialize_conch.c: Likewise. * libiohelp/iohelp.h: Likewise. * libiohelp/verify_user_conch.c: Likewise. * libnetfs/Makefile: Likewise. * libnetfs/dir-lookup.c: Likewise. * libnetfs/dir-mkdir.c: Likewise. * libnetfs/dir-mkfile.c: Likewise. * libnetfs/dir-readdir.c: Likewise. * libnetfs/dir-rmdir.c: Likewise. * libnetfs/dir-unlink.c: Likewise. * libnetfs/drop-node.c: Likewise. * libnetfs/file-chauthor.c: Likewise. * libnetfs/file-check-access.c: Likewise. * libnetfs/file-chflags.c: Likewise. * libnetfs/file-chmod.c: Likewise. * libnetfs/file-chown.c: Likewise. * libnetfs/file-exec.c: Likewise. * libnetfs/file-get-storage-info.c: Likewise. * libnetfs/file-get-translator.c: Likewise. * libnetfs/file-lock-stat.c: Likewise. * libnetfs/file-lock.c: Likewise. * libnetfs/file-reparent.c: Likewise. * libnetfs/file-set-size.c: Likewise. * libnetfs/file-set-translator.c: Likewise. * libnetfs/file-statfs.c: Likewise. * libnetfs/file-sync.c: Likewise. * libnetfs/file-syncfs.c: Likewise. * libnetfs/file-utimes.c: Likewise. * libnetfs/fsys-getroot.c: Likewise. * libnetfs/fsys-set-options.c: Likewise. * libnetfs/init-init.c: Likewise. * libnetfs/io-clear-some-openmodes.c: Likewise. * libnetfs/io-duplicate.c: Likewise. * libnetfs/io-get-openmodes.c: Likewise. * libnetfs/io-get-owner.c: Likewise. * libnetfs/io-identity.c: Likewise. * libnetfs/io-mod-owner.c: Likewise. * libnetfs/io-read.c: Likewise. * libnetfs/io-readable.c: Likewise. * libnetfs/io-reauthenticate.c: Likewise. * libnetfs/io-restrict-auth.c: Likewise. * libnetfs/io-revoke.c: Likewise. * libnetfs/io-seek.c: Likewise. * libnetfs/io-set-all-openmodes.c: Likewise. * libnetfs/io-set-some-openmodes.c: Likewise. * libnetfs/io-stat.c: Likewise. * libnetfs/io-write.c: Likewise. * libnetfs/make-node.c: Likewise. * libnetfs/netfs.h: Likewise. * libnetfs/nput.c: Likewise. * libnetfs/nref.c: Likewise. * libnetfs/nrele.c: Likewise. * libnetfs/release-peropen.c: Likewise. * libnetfs/shutdown.c: Likewise. * libpager/Makefile: Likewise. * libpager/chg-compl.c: Likewise. * libpager/clean.c: Likewise. * libpager/data-request.c: Likewise. * libpager/data-return.c: Likewise. * libpager/data-unlock.c: Likewise. * libpager/inhibit-term.c: Likewise. * libpager/lock-completed.c: Likewise. * libpager/lock-object.c: Likewise. * libpager/mark-error.c: Likewise. * libpager/no-senders.c: Likewise. * libpager/object-init.c: Likewise. * libpager/object-terminate.c: Likewise. * libpager/offer-page.c: Likewise. * libpager/pager-attr.c: Likewise. * libpager/pager-create.c: Likewise. * libpager/pager-shutdown.c: Likewise. * libpager/priv.h: Likewise. * libpager/seqnos.c: Likewise. * libpipe/Makefile: Likewise. * libpipe/pipe.c: Likewise. * libpipe/pipe.h: Likewise. * libports/Makefile: Likewise. * libports/begin-rpc.c: Likewise. * libports/bucket-iterate.c: Likewise. * libports/claim-right.c: Likewise. * libports/class-iterate.c: Likewise. * libports/complete-deallocate.c: Likewise. * libports/count-bucket.c: Likewise. * libports/count-class.c: Likewise. * libports/create-bucket.c: Likewise. * libports/create-internal.c: Likewise. * libports/destroy-right.c: Likewise. * libports/enable-bucket.c: Likewise. * libports/enable-class.c: Likewise. * libports/end-rpc.c: Likewise. * libports/get-right.c: Likewise. * libports/import-port.c: Likewise. * libports/inhibit-all-rpcs.c: Likewise. * libports/inhibit-bucket-rpcs.c: Likewise. * libports/inhibit-class-rpcs.c: Likewise. * libports/inhibit-port-rpcs.c: Likewise. * libports/init.c: Likewise. * libports/interrupt-notified-rpcs.c: Likewise. * libports/interrupt-on-notify.c: Likewise. * libports/interrupt-operation.c: Likewise. * libports/interrupt-rpcs.c: Likewise. * libports/interrupted.c: Likewise. * libports/lookup-port.c: Likewise. * libports/manage-multithread.c: Likewise. * libports/no-senders.c: Likewise. * libports/port-deref-weak.c: Likewise. * libports/port-deref.c: Likewise. * libports/port-ref-weak.c: Likewise. * libports/port-ref.c: Likewise. * libports/ports.h: Likewise. * libports/reallocate-from-external.c: Likewise. * libports/reallocate-port.c: Likewise. * libports/resume-all-rpcs.c: Likewise. * libports/resume-bucket-rpcs.c: Likewise. * libports/resume-class-rpcs.c: Likewise. * libports/resume-port-rpcs.c: Likewise. * libports/stubs.c: Likewise. * libports/transfer-right.c: Likewise. * libstore/Makefile: Likewise. * libstore/gunzip.c: Likewise. * libstore/part.c: Likewise. * libstore/unzipstore.c: Likewise. * libthreads/Makefile: Likewise. * libtreefs/dir-lookup.c: Likewise. * libtreefs/fsys-getroot.c: Likewise. * libtreefs/fsys-hooks.c: Likewise. * libtreefs/fsys.c: Likewise. * libtreefs/trans-help.c: Likewise. * libtreefs/trans-start.c: Likewise. * libtreefs/treefs.h: Likewise. * libtrivfs/cntl-create.c: Likewise. * libtrivfs/dyn-classes.c: Likewise. * libtrivfs/io-reauthenticate.c: Likewise. * libtrivfs/io-restrict-auth.c: Likewise. * libtrivfs/protid-clean.c: Likewise. * libtrivfs/protid-dup.c: Likewise. * libtrivfs/trivfs.h: Likewise. * mach-defpager/Makefile: Likewise. * mach-defpager/default_pager.c: Likewise. * mach-defpager/kalloc.c: Likewise. * mach-defpager/main.c: Likewise. * nfs/Makefile: Likewise. * nfs/cache.c: Likewise. * nfs/main.c: Likewise. * nfs/mount.c: Likewise. * nfs/name-cache.c: Likewise. * nfs/nfs.h: Likewise. * nfs/ops.c: Likewise. * nfs/rpc.c: Likewise. * nfsd/Makefile: Likewise. * nfsd/cache.c: Likewise. * nfsd/loop.c: Likewise. * nfsd/main.c: Likewise. * nfsd/nfsd.h: Likewise. * pfinet/Makefile: Likewise. * pfinet/ethernet.c: Likewise. * pfinet/glue-include/asm/spinlock.h: Likewise. * pfinet/glue-include/linux/interrupt.h: Likewise. * pfinet/glue-include/linux/sched.h: Likewise. * pfinet/glue-include/linux/timer.h: Likewise. * pfinet/glue-include/linux/wait.h: Likewise. * pfinet/iioctl-ops.c: Likewise. * pfinet/io-ops.c: Likewise. * pfinet/kmem_cache.c: Likewise. * pfinet/main.c: Likewise. * pfinet/options.c: Likewise. * pfinet/pfinet-ops.c: Likewise. * pfinet/pfinet.h: Likewise. * pfinet/sched.c: Likewise. * pfinet/socket-ops.c: Likewise. * pfinet/socket.c: Likewise. * pfinet/timer-emul.c: Likewise. * pfinet/tunnel.c: Likewise. * pflocal/Makefile: Likewise. * pflocal/connq.c: Likewise. * pflocal/io.c: Likewise. * pflocal/sock.c: Likewise. * pflocal/sock.h: Likewise. * pflocal/socket.c: Likewise. * pflocal/sserver.c: Likewise. * proc/Makefile: Likewise. * proc/info.c: Likewise. * proc/main.c: Likewise. * proc/mgt.c: Likewise. * proc/msg.c: Likewise. * proc/proc.h: Likewise. * proc/stubs.c: Likewise. * proc/wait.c: Likewise. * storeio/Makefile: Likewise. * storeio/dev.c: Likewise. * storeio/dev.h: Likewise. * storeio/open.c: Likewise. * storeio/open.h: Likewise. * storeio/pager.c: Likewise. * storeio/storeio.c: Likewise. * term/Makefile: Likewise. * term/devio.c: Likewise. * term/hurdio.c: Likewise. * term/main.c: Likewise. * term/munge.c: Likewise. * term/ptyio.c: Likewise. * term/term.h: Likewise. * term/users.c: Likewise. * tmpfs/Makefile: Likewise. * tmpfs/dir.c: Likewise. * tmpfs/node.c: Likewise. * tmpfs/tmpfs.c: Likewise. * tmpfs/tmpfs.h: Likewise. * trans/Makefile: Likewise. * trans/fakeroot.c: Likewise. * trans/fifo.c: Likewise. * trans/hello-mt.c: Likewise. * trans/new-fifo.c: Likewise. * trans/streamio.c: Likewise. * ufs/Makefile: Likewise. * ufs/alloc.c: Likewise. * ufs/dir.c: Likewise. * ufs/hyper.c: Likewise. * ufs/inode.c: Likewise. * ufs/main.c: Likewise. * ufs/pager.c: Likewise. * ufs/pokeloc.c: Likewise. * ufs/sizes.c: Likewise. * ufs/ufs.h: Likewise. * usermux/Makefile: Likewise. * usermux/mux.c: Likewise. * usermux/node.c: Likewise. * usermux/usermux.h: Likewise. * utils/Makefile: Likewise. * utils/fakeauth.c: Likewise. * utils/rpctrace.c: Likewise. --- nfsd/Makefile | 3 ++- nfsd/cache.c | 71 ++++++++++++++++++++++++++++++----------------------------- nfsd/loop.c | 5 +++-- nfsd/main.c | 23 +++++++++++++++---- nfsd/nfsd.h | 6 ++--- 5 files changed, 63 insertions(+), 45 deletions(-) (limited to 'nfsd') diff --git a/nfsd/Makefile b/nfsd/Makefile index 5487a946..daaf86e8 100644 --- a/nfsd/Makefile +++ b/nfsd/Makefile @@ -24,7 +24,8 @@ SRCS = cache.c loop.c main.c ops.c fsys.c xdr.c OBJS = $(subst .c,.o,$(SRCS)) target = nfsd installationdir = $(sbindir) -HURDLIBS=threads shouldbeinlibc +HURDLIBS = shouldbeinlibc +OTHERLIBS = -lpthread include ../Makeconf diff --git a/nfsd/cache.c b/nfsd/cache.c index 7b96dbc2..060cc738 100644 --- a/nfsd/cache.c +++ b/nfsd/cache.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include "nfsd.h" @@ -42,7 +43,7 @@ static struct idspec *idhashtable[IDHASH_TABLE_SIZE]; -spin_lock_t idhashlock = SPIN_LOCK_INITIALIZER; +pthread_spinlock_t idhashlock = PTHREAD_SPINLOCK_INITIALIZER; static int nfreeids; static int leastidlastuse; @@ -90,14 +91,14 @@ idspec_lookup (int nuids, int ngids, int *uids, int *gids) hash = idspec_hash (nuids, ngids, uids, gids); - spin_lock (&idhashlock); + pthread_spin_lock (&idhashlock); for (i = idhashtable[hash]; i; i = i->next) if (idspec_compare (i, nuids, ngids, uids, gids)) { i->references++; if (i->references == 1) nfreeids--; - spin_unlock (&idhashlock); + pthread_spin_unlock (&idhashlock); return i; } @@ -117,7 +118,7 @@ idspec_lookup (int nuids, int ngids, int *uids, int *gids) i->prevp = &idhashtable[hash]; idhashtable[hash] = i; - spin_unlock (&idhashlock); + pthread_spin_unlock (&idhashlock); return i; } @@ -184,7 +185,7 @@ process_cred (int *p, struct idspec **credp) void cred_rele (struct idspec *i) { - spin_lock (&idhashlock); + pthread_spin_lock (&idhashlock); i->references--; if (i->references == 0) { @@ -193,16 +194,16 @@ cred_rele (struct idspec *i) leastidlastuse = i->lastuse; nfreeids++; } - spin_unlock (&idhashlock); + pthread_spin_unlock (&idhashlock); } void cred_ref (struct idspec *i) { - spin_lock (&idhashlock); + pthread_spin_lock (&idhashlock); assert (i->references); i->references++; - spin_unlock (&idhashlock); + pthread_spin_unlock (&idhashlock); } void @@ -211,7 +212,7 @@ scan_creds () int n; int newleast = mapped_time->seconds; - spin_lock (&idhashlock); + pthread_spin_lock (&idhashlock); if (mapped_time->seconds - leastidlastuse > ID_KEEP_TIMEOUT) { @@ -245,13 +246,13 @@ scan_creds () if (nfreeids) leastidlastuse = newleast; } - spin_unlock (&idhashlock); + pthread_spin_unlock (&idhashlock); } static struct cache_handle *fhhashtable[FHHASH_TABLE_SIZE]; -struct mutex fhhashlock = MUTEX_INITIALIZER; +pthread_mutex_t fhhashlock = PTHREAD_MUTEX_INITIALIZER; static int nfreefh; static int leastfhlastuse; @@ -275,14 +276,14 @@ lookup_cache_handle (int *p, struct cache_handle **cp, struct idspec *i) file_t port; hash = fh_hash ((char *)p, i); - mutex_lock (&fhhashlock); + pthread_mutex_lock (&fhhashlock); for (c = fhhashtable[hash]; c; c = c->next) if (c->ids == i && ! bcmp (c->handle, p, NFS2_FHSIZE)) { if (c->references == 0) nfreefh--; c->references++; - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); *cp = c; return p + NFS2_FHSIZE / sizeof (int); } @@ -295,7 +296,7 @@ lookup_cache_handle (int *p, struct cache_handle **cp, struct idspec *i) || fsys_getfile (fsys, i->uids, i->nuids, i->gids, i->ngids, (char *)(p + 1), NFS2_FHSIZE - sizeof (int), &port)) { - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); *cp = 0; return p + NFS2_FHSIZE / sizeof (int); } @@ -313,7 +314,7 @@ lookup_cache_handle (int *p, struct cache_handle **cp, struct idspec *i) c->prevp = &fhhashtable[hash]; fhhashtable[hash] = c; - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); *cp = c; return p + NFS2_FHSIZE / sizeof (int); } @@ -321,7 +322,7 @@ lookup_cache_handle (int *p, struct cache_handle **cp, struct idspec *i) void cache_handle_rele (struct cache_handle *c) { - mutex_lock (&fhhashlock); + pthread_mutex_lock (&fhhashlock); c->references--; if (c->references == 0) { @@ -330,7 +331,7 @@ cache_handle_rele (struct cache_handle *c) leastfhlastuse = c->lastuse; nfreefh++; } - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); } void @@ -339,7 +340,7 @@ scan_fhs () int n; int newleast = mapped_time->seconds; - mutex_lock (&fhhashlock); + pthread_mutex_lock (&fhhashlock); if (mapped_time->seconds - leastfhlastuse > FH_KEEP_TIMEOUT) { @@ -373,7 +374,7 @@ scan_fhs () if (nfreefh) leastfhlastuse = newleast; } - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); } struct cache_handle * @@ -416,7 +417,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) /* Cache it. */ hash = fh_hash (fhandle, credc->ids); - mutex_lock (&fhhashlock); + pthread_mutex_lock (&fhhashlock); for (c = fhhashtable[hash]; c; c = c->next) if (c->ids == credc->ids && ! bcmp (fhandle, c->handle, NFS2_FHSIZE)) { @@ -424,7 +425,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) if (c->references == 0) nfreefh--; c->references++; - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); return c; } @@ -438,7 +439,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) &newport); if (err) { - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); return 0; } @@ -456,7 +457,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) c->next->prevp = &c->next; c->prevp = &fhhashtable[hash]; fhhashtable[hash] = c; - mutex_unlock (&fhhashlock); + pthread_mutex_unlock (&fhhashlock); return c; } @@ -464,7 +465,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) static struct cached_reply *replyhashtable [REPLYHASH_TABLE_SIZE]; -static spin_lock_t replycachelock = SPIN_LOCK_INITIALIZER; +pthread_spinlock_t replycachelock = PTHREAD_SPINLOCK_INITIALIZER; static int nfreereplies; static int leastreplylastuse; @@ -480,7 +481,7 @@ check_cached_replies (int xid, hash = abs(xid % REPLYHASH_TABLE_SIZE); - spin_lock (&replycachelock); + pthread_spin_lock (&replycachelock); for (cr = replyhashtable[hash]; cr; cr = cr->next) if (cr->xid == xid && !bcmp (sender, &cr->source, sizeof (struct sockaddr_in))) @@ -488,14 +489,14 @@ check_cached_replies (int xid, cr->references++; if (cr->references == 1) nfreereplies--; - spin_unlock (&replycachelock); - mutex_lock (&cr->lock); + pthread_spin_unlock (&replycachelock); + pthread_mutex_lock (&cr->lock); return cr; } cr = malloc (sizeof (struct cached_reply)); - mutex_init (&cr->lock); - mutex_lock (&cr->lock); + pthread_mutex_init (&cr->lock, NULL); + pthread_mutex_lock (&cr->lock); memcpy (&cr->source, sender, sizeof (struct sockaddr_in)); cr->xid = xid; cr->data = 0; @@ -507,7 +508,7 @@ check_cached_replies (int xid, cr->prevp = &replyhashtable[hash]; replyhashtable[hash] = cr; - spin_unlock (&replycachelock); + pthread_spin_unlock (&replycachelock); return cr; } @@ -516,8 +517,8 @@ check_cached_replies (int xid, void release_cached_reply (struct cached_reply *cr) { - mutex_unlock (&cr->lock); - spin_lock (&replycachelock); + pthread_mutex_unlock (&cr->lock); + pthread_spin_lock (&replycachelock); cr->references--; if (cr->references == 0) { @@ -526,7 +527,7 @@ release_cached_reply (struct cached_reply *cr) leastreplylastuse = cr->lastuse; nfreereplies++; } - spin_unlock (&replycachelock); + pthread_spin_unlock (&replycachelock); } void @@ -535,7 +536,7 @@ scan_replies () int n; int newleast = mapped_time->seconds; - spin_lock (&replycachelock); + pthread_spin_lock (&replycachelock); if (mapped_time->seconds - leastreplylastuse > REPLY_KEEP_TIMEOUT) { @@ -569,5 +570,5 @@ scan_replies () if (nfreereplies) leastreplylastuse = newleast; } - spin_unlock (&replycachelock); + pthread_spin_unlock (&replycachelock); } diff --git a/nfsd/loop.c b/nfsd/loop.c index bfec5e5a..f2d6d546 100644 --- a/nfsd/loop.c +++ b/nfsd/loop.c @@ -35,9 +35,10 @@ #include #undef malloc -void -server_loop (int fd) +void * +server_loop (void *arg) { + int fd = (int) arg; char buf[MAXIOSIZE]; int xid; int *p, *r; diff --git a/nfsd/main.c b/nfsd/main.c index ee071090..d5607d37 100644 --- a/nfsd/main.c +++ b/nfsd/main.c @@ -24,6 +24,7 @@ #include #include #include +#include #include int main_udp_socket, pmap_udp_socket; @@ -31,6 +32,22 @@ struct sockaddr_in main_address, pmap_address; static char index_file[] = LOCALSTATEDIR "/state/misc/nfsd.index"; char *index_file_name = index_file; +/* Launch a server loop thread */ +static void +create_server_thread (int socket) +{ + pthread_t thread; + int fail; + + fail = pthread_create (&thread, NULL, server_loop, (void *) socket); + if (fail) + error (1, fail, "Creating main server thread"); + + fail = pthread_detach (thread); + if (fail) + error (1, fail, "Detaching main server thread"); +} + int main (int argc, char **argv) { @@ -73,12 +90,10 @@ main (int argc, char **argv) init_filesystems (); - cthread_detach (cthread_fork ((cthread_fn_t) server_loop, - (any_t)(intptr_t) pmap_udp_socket)); + create_server_thread (pmap_udp_socket); while (nthreads--) - cthread_detach (cthread_fork ((cthread_fn_t) server_loop, - (any_t)(intptr_t) main_udp_socket)); + create_server_thread (main_udp_socket); for (;;) { diff --git a/nfsd/nfsd.h b/nfsd/nfsd.h index e89a411b..4afff061 100644 --- a/nfsd/nfsd.h +++ b/nfsd/nfsd.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "../nfs/nfs-spec.h" /* XXX */ #include @@ -55,7 +55,7 @@ struct cache_handle struct cached_reply { struct cached_reply *next, **prevp; - struct mutex lock; + pthread_mutex_t lock; struct sockaddr_in source; int xid; time_t lastuse; @@ -109,7 +109,7 @@ void release_cached_reply (struct cached_reply *cr); void scan_replies (void); /* loop.c */ -void server_loop (int); +void * server_loop (void *); /* ops.c */ extern struct proctable nfs2table, mounttable, pmaptable; -- cgit v1.2.3