summaryrefslogtreecommitdiff
path: root/storeio
diff options
context:
space:
mode:
Diffstat (limited to 'storeio')
-rw-r--r--storeio/Makefile3
-rw-r--r--storeio/dev.c18
-rw-r--r--storeio/dev.h8
-rw-r--r--storeio/open.c14
-rw-r--r--storeio/open.h2
-rw-r--r--storeio/pager.c40
-rw-r--r--storeio/storeio.c20
7 files changed, 60 insertions, 45 deletions
diff --git a/storeio/Makefile b/storeio/Makefile
index 0190be07..c1317587 100644
--- a/storeio/Makefile
+++ b/storeio/Makefile
@@ -23,6 +23,7 @@ target = storeio
SRCS = dev.c storeio.c open.c pager.c io.c
OBJS = $(SRCS:.c=.o)
-HURDLIBS = trivfs pager fshelp iohelp store threads ports ihash shouldbeinlibc
+HURDLIBS = trivfs pager fshelp iohelp store ports ihash shouldbeinlibc
+OTHERLIBS = -lpthread
include ../Makeconf
diff --git a/storeio/dev.c b/storeio/dev.c
index 31b084f9..8f520cd2 100644
--- a/storeio/dev.c
+++ b/storeio/dev.c
@@ -173,10 +173,10 @@ dev_open (struct dev *dev)
if (!dev->inhibit_cache)
{
dev->buf_offs = -1;
- rwlock_init (&dev->io_lock);
+ pthread_rwlock_init (&dev->io_lock, NULL);
dev->block_mask = (1 << dev->store->log2_block_size) - 1;
dev->pager = 0;
- mutex_init (&dev->pager_lock);
+ pthread_mutex_init (&dev->pager_lock, NULL);
}
return 0;
@@ -218,9 +218,9 @@ dev_sync(struct dev *dev, int wait)
if (dev->pager != NULL)
pager_sync (dev->pager, wait);
- rwlock_writer_lock (&dev->io_lock);
+ pthread_rwlock_wrlock (&dev->io_lock);
err = dev_buf_discard (dev);
- rwlock_writer_unlock (&dev->io_lock);
+ pthread_rwlock_unlock (&dev->io_lock);
return err;
}
@@ -243,7 +243,7 @@ buffered_rw (struct dev *dev, off_t offs, size_t len, size_t *amount,
size_t io_offs = 0; /* Offset within this I/O operation. */
unsigned block_offs = offs & block_mask; /* Offset within a block. */
- rwlock_writer_lock (&dev->io_lock);
+ pthread_rwlock_wrlock (&dev->io_lock);
if (block_offs != 0)
/* The start of the I/O isn't block aligned. */
@@ -282,7 +282,7 @@ buffered_rw (struct dev *dev, off_t offs, size_t len, size_t *amount,
if (! err)
*amount = io_offs;
- rwlock_writer_unlock (&dev->io_lock);
+ pthread_rwlock_unlock (&dev->io_lock);
return err;
}
@@ -306,7 +306,7 @@ dev_rw (struct dev *dev, off_t offs, size_t len, size_t *amount,
else if (offs + len > dev->store->size)
len = dev->store->size - offs;
- rwlock_reader_lock (&dev->io_lock);
+ pthread_rwlock_rdlock (&dev->io_lock);
if (dev_buf_is_active (dev)
|| (offs & block_mask) != 0 || (len & block_mask) != 0)
/* Some non-aligned I/O has been done, or is needed, so we need to deal
@@ -314,14 +314,14 @@ dev_rw (struct dev *dev, off_t offs, size_t len, size_t *amount,
{
/* Acquire a writer lock instead of a reader lock. Note that other
writers may have acquired the lock by the time we get it. */
- rwlock_reader_unlock (&dev->io_lock);
+ pthread_rwlock_unlock (&dev->io_lock);
err = buffered_rw (dev, offs, len, amount, buf_rw, raw_rw);
}
else
/* Only block-aligned I/O is being done, so things are easy. */
{
err = (*raw_rw) (offs, 0, len, amount);
- rwlock_reader_unlock (&dev->io_lock);
+ pthread_rwlock_unlock (&dev->io_lock);
}
return err;
diff --git a/storeio/dev.h b/storeio/dev.h
index 23924ca5..139668a7 100644
--- a/storeio/dev.h
+++ b/storeio/dev.h
@@ -22,7 +22,7 @@
#include <mach.h>
#include <device/device.h>
-#include <rwlock.h>
+#include <pthread.h>
#include <hurd/store.h>
#include <hurd/trivfs.h>
@@ -57,7 +57,7 @@ struct dev
/* This lock protects `store', `owner' and `nperopens'. The other
members never change after creation, except for those locked by
io_lock (below). */
- struct mutex lock;
+ pthread_mutex_t lock;
/* Nonzero iff the --no-cache flag was given.
If this is set, the remaining members are not used at all
@@ -71,7 +71,7 @@ struct dev
/* Lock to arbitrate I/O through this device. Block I/O can occur in
parallel, and requires only a reader-lock.
Non-block I/O is always serialized, and requires a writer-lock. */
- struct rwlock io_lock;
+ pthread_rwlock_t io_lock;
/* Non-block I/O is buffered through BUF. BUF_OFFS is the device offset
corresponding to the start of BUF (which holds one block); if it is -1,
@@ -81,7 +81,7 @@ struct dev
int buf_dirty;
struct pager *pager;
- struct mutex pager_lock;
+ pthread_mutex_t pager_lock;
};
static inline int
diff --git a/storeio/open.c b/storeio/open.c
index 805115ce..f6a641d7 100644
--- a/storeio/open.c
+++ b/storeio/open.c
@@ -35,7 +35,7 @@ open_create (struct dev *dev, struct open **open)
(*open)->dev = dev;
(*open)->offs = 0;
- mutex_init (&(*open)->lock);
+ pthread_mutex_init (&(*open)->lock, NULL);
return 0;
}
@@ -59,11 +59,11 @@ open_write (struct open *open, off_t offs, void *buf, size_t len,
if (offs < 0)
/* Use OPEN's offset. */
{
- mutex_lock (&open->lock);
+ pthread_mutex_lock (&open->lock);
err = dev_write (open->dev, open->offs, buf, len, amount);
if (! err)
open->offs += *amount;
- mutex_unlock (&open->lock);
+ pthread_mutex_unlock (&open->lock);
}
else
err = dev_write (open->dev, offs, buf, len, amount);
@@ -81,11 +81,11 @@ open_read (struct open *open, off_t offs, size_t amount,
if (offs < 0)
/* Use OPEN's offset. */
{
- mutex_lock (&open->lock);
+ pthread_mutex_lock (&open->lock);
err = dev_read (open->dev, open->offs, amount, buf, len);
if (! err)
open->offs += *len;
- mutex_unlock (&open->lock);
+ pthread_mutex_unlock (&open->lock);
}
else
err = dev_read (open->dev, offs, amount, buf, len);
@@ -101,7 +101,7 @@ open_seek (struct open *open, off_t offs, int whence, off_t *new_offs)
{
error_t err = 0;
- mutex_lock (&open->lock);
+ pthread_mutex_lock (&open->lock);
switch (whence)
{
@@ -121,7 +121,7 @@ open_seek (struct open *open, off_t offs, int whence, off_t *new_offs)
err = EINVAL;
}
- mutex_unlock (&open->lock);
+ pthread_mutex_unlock (&open->lock);
return err;
}
diff --git a/storeio/open.h b/storeio/open.h
index cbac2a37..78ad95ca 100644
--- a/storeio/open.h
+++ b/storeio/open.h
@@ -36,7 +36,7 @@ struct open
off_t offs;
/* A lock used to control write access to OFFS. */
- struct mutex lock;
+ pthread_mutex_t lock;
};
/* Returns a new per-open structure for the device DEV in OPEN. If an error
diff --git a/storeio/pager.c b/storeio/pager.c
index 1fb1d07e..cbae7eb6 100644
--- a/storeio/pager.c
+++ b/storeio/pager.c
@@ -25,6 +25,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
+#include <stdio.h>
#include "dev.h"
@@ -127,22 +128,26 @@ void
pager_clear_user_data (struct user_pager_info *upi)
{
struct dev *dev = (struct dev *)upi;
- mutex_lock (&dev->pager_lock);
+ pthread_mutex_lock (&dev->pager_lock);
dev->pager = 0;
- mutex_unlock (&dev->pager_lock);
+ pthread_mutex_unlock (&dev->pager_lock);
}
static struct port_bucket *pager_port_bucket = 0;
/* A top-level function for the paging thread that just services paging
requests. */
-static void
-service_paging_requests (any_t arg)
+static void *
+service_paging_requests (void *arg)
{
+ (void) arg;
+
for (;;)
ports_manage_port_operations_multithread (pager_port_bucket,
pager_demuxer,
1000 * 30, 1000 * 60 * 5, 0);
+
+ return NULL;
}
/* Initialize paging for this device. */
@@ -151,18 +156,27 @@ init_dev_paging ()
{
if (! pager_port_bucket)
{
- static struct mutex pager_global_lock = MUTEX_INITIALIZER;
+ static pthread_mutex_t pager_global_lock = PTHREAD_MUTEX_INITIALIZER;
- mutex_lock (&pager_global_lock);
+ pthread_mutex_lock (&pager_global_lock);
if (pager_port_bucket == NULL)
{
+ pthread_t thread;
+ error_t err;
+
pager_port_bucket = ports_create_bucket ();
/* Make a thread to service paging requests. */
- cthread_detach (cthread_fork ((cthread_fn_t)service_paging_requests,
- (any_t)0));
+ err = pthread_create (&thread, NULL, service_paging_requests, NULL);
+ if (!err)
+ pthread_detach (thread);
+ else
+ {
+ errno = err;
+ perror ("pthread_create");
+ }
}
- mutex_unlock (&pager_global_lock);
+ pthread_mutex_unlock (&pager_global_lock);
}
}
@@ -226,7 +240,7 @@ dev_get_memory_object (struct dev *dev, vm_prot_t prot, memory_object_t *memobj)
init_dev_paging ();
- mutex_lock (&dev->pager_lock);
+ pthread_mutex_lock (&dev->pager_lock);
if (dev->pager == NULL)
{
@@ -235,7 +249,7 @@ dev_get_memory_object (struct dev *dev, vm_prot_t prot, memory_object_t *memobj)
1, MEMORY_OBJECT_COPY_DELAY);
if (dev->pager == NULL)
{
- mutex_unlock (&dev->pager_lock);
+ pthread_mutex_unlock (&dev->pager_lock);
return errno;
}
created = 1;
@@ -247,7 +261,7 @@ dev_get_memory_object (struct dev *dev, vm_prot_t prot, memory_object_t *memobj)
/* Pager is currently being destroyed, try again. */
{
dev->pager = 0;
- mutex_unlock (&dev->pager_lock);
+ pthread_mutex_unlock (&dev->pager_lock);
return dev_get_memory_object (dev, prot, memobj);
}
else
@@ -258,7 +272,7 @@ dev_get_memory_object (struct dev *dev, vm_prot_t prot, memory_object_t *memobj)
if (created)
ports_port_deref (dev->pager);
- mutex_unlock (&dev->pager_lock);
+ pthread_mutex_unlock (&dev->pager_lock);
}
return err;
diff --git a/storeio/storeio.c b/storeio/storeio.c
index a88c8e43..3bde9644 100644
--- a/storeio/storeio.c
+++ b/storeio/storeio.c
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
struct storeio_argp_params params;
bzero (&device, sizeof device);
- mutex_init (&device.lock);
+ pthread_mutex_init (&device.lock, NULL);
params.dev = &device;
argp_parse (&argp, argc, argv, 0, 0, &params);
@@ -221,7 +221,7 @@ check_open_hook (struct trivfs_control *trivfs_control,
if (!err && dev_is_readonly (dev) && (flags & O_WRITE))
return EROFS;
- mutex_lock (&dev->lock);
+ pthread_mutex_lock (&dev->lock);
if (dev->store == NULL)
{
/* Try and open the store. */
@@ -231,7 +231,7 @@ check_open_hook (struct trivfs_control *trivfs_control,
error, as this allows stat to work correctly. XXX */
err = 0;
}
- mutex_unlock (&dev->lock);
+ pthread_mutex_unlock (&dev->lock);
return err;
}
@@ -244,10 +244,10 @@ open_hook (struct trivfs_peropen *peropen)
if (dev->store)
{
- mutex_lock (&dev->lock);
+ pthread_mutex_lock (&dev->lock);
if (dev->nperopens++ == 0)
err = store_clear_flags (dev->store, STORE_INACTIVE);
- mutex_unlock (&dev->lock);
+ pthread_mutex_unlock (&dev->lock);
if (!err)
err = open_create (dev, (struct open **)&peropen->hook);
}
@@ -261,10 +261,10 @@ close_hook (struct trivfs_peropen *peropen)
if (peropen->hook)
{
- mutex_lock (&dev->lock);
+ pthread_mutex_lock (&dev->lock);
if (--dev->nperopens == 0)
store_set_flags (dev->store, STORE_INACTIVE);
- mutex_unlock (&dev->lock);
+ pthread_mutex_unlock (&dev->lock);
open_free (peropen->hook);
}
}
@@ -325,7 +325,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
int nosync = (flags & FSYS_GOAWAY_NOSYNC);
struct port_class *root_port_class = fsys->protid_class;
- mutex_lock (&device->lock);
+ pthread_mutex_lock (&device->lock);
if (device->store == NULL)
/* The device is not actually open.
@@ -337,7 +337,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
err = ports_inhibit_class_rpcs (root_port_class);
if (err == EINTR || (err && !force))
{
- mutex_unlock (&device->lock);
+ pthread_mutex_unlock (&device->lock);
return err;
}
@@ -370,7 +370,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
/* Allow normal operations to proceed. */
ports_enable_class (root_port_class);
ports_resume_class_rpcs (root_port_class);
- mutex_unlock (&device->lock);
+ pthread_mutex_unlock (&device->lock);
/* Complain that there are still users. */
return EBUSY;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 13:31:08 +0000