summaryrefslogtreecommitdiff
path: root/libpager
diff options
context:
space:
mode:
Diffstat (limited to 'libpager')
-rw-r--r--libpager/Makefile3
-rw-r--r--libpager/chg-compl.c6
-rw-r--r--libpager/clean.c4
-rw-r--r--libpager/data-request.c14
-rw-r--r--libpager/data-return.c14
-rw-r--r--libpager/data-unlock.c4
-rw-r--r--libpager/inhibit-term.c2
-rw-r--r--libpager/lock-completed.c6
-rw-r--r--libpager/lock-object.c8
-rw-r--r--libpager/mark-error.c4
-rw-r--r--libpager/no-senders.c4
-rw-r--r--libpager/object-init.c4
-rw-r--r--libpager/object-terminate.c8
-rw-r--r--libpager/offer-page.c8
-rw-r--r--libpager/pager-attr.c10
-rw-r--r--libpager/pager-create.c4
-rw-r--r--libpager/pager-shutdown.c4
-rw-r--r--libpager/priv.h5
-rw-r--r--libpager/seqnos.c8
19 files changed, 61 insertions, 59 deletions
diff --git a/libpager/Makefile b/libpager/Makefile
index 40eed16f..4d635b17 100644
--- a/libpager/Makefile
+++ b/libpager/Makefile
@@ -27,7 +27,8 @@ SRCS = data-request.c data-return.c data-unlock.c pager-port.c \
offer-page.c
installhdrs = pager.h
-HURDLIBS= threads ports
+HURDLIBS= ports
+LDLIBS += -lpthread
OBJS = $(SRCS:.c=.o) memory_objectServer.o notifyServer.o
MIGSFLAGS = -DSEQNOS
diff --git a/libpager/chg-compl.c b/libpager/chg-compl.c
index 7d3994b0..890e89b8 100644
--- a/libpager/chg-compl.c
+++ b/libpager/chg-compl.c
@@ -37,19 +37,19 @@ _pager_seqnos_memory_object_change_completed (mach_port_t obj,
return EOPNOTSUPP;
}
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seq);
for (ar = p->attribute_requests; ar; ar = ar->next)
if (ar->may_cache == maycache && ar->copy_strategy == strat)
{
if (ar->attrs_pending && !--ar->attrs_pending)
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
break;
}
_pager_release_seqno (p, seq);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
}
diff --git a/libpager/clean.c b/libpager/clean.c
index e891617f..031f7d1b 100644
--- a/libpager/clean.c
+++ b/libpager/clean.c
@@ -32,7 +32,7 @@ _pager_clean (void *arg)
if (p->pager_state != NOTINIT)
{
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_free_structure (p);
#ifdef KERNEL_INIT_RACE
for (i = p->init_head; i; i = tmp)
@@ -43,7 +43,7 @@ _pager_clean (void *arg)
free (i);
}
#endif
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
}
pager_clear_user_data (p->upi);
diff --git a/libpager/data-request.c b/libpager/data-request.c
index 36725b11..4454facb 100644
--- a/libpager/data-request.c
+++ b/libpager/data-request.c
@@ -41,7 +41,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
return EOPNOTSUPP;
/* Acquire the right to meddle with the pagemap */
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
/* sanity checks -- we don't do multi-page requests yet. */
@@ -107,7 +107,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
/* Let someone else in. */
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
if (!doread)
goto allow_term_out;
@@ -121,10 +121,10 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
memory_object_data_supply (p->memobjcntl, offset, page, length, 1,
write_lock ? VM_PROT_WRITE : VM_PROT_NONE, 0,
MACH_PORT_NULL);
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_mark_object_error (p, offset, length, 0);
_pager_allow_termination (p);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
@@ -132,9 +132,9 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
memory_object_data_error (p->memobjcntl, offset, length, EIO);
_pager_mark_object_error (p, offset, length, EIO);
allow_term_out:
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_allow_termination (p);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
@@ -142,7 +142,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
_pager_allow_termination (p);
release_out:
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
}
diff --git a/libpager/data-return.c b/libpager/data-return.c
index a010c6dc..c70f0e8d 100644
--- a/libpager/data-return.c
+++ b/libpager/data-return.c
@@ -51,7 +51,7 @@ _pager_do_write_request (mach_port_t object,
return EOPNOTSUPP;
/* Acquire the right to meddle with the pagemap */
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
/* sanity checks -- we don't do multi-page requests yet. */
@@ -100,7 +100,7 @@ _pager_do_write_request (mach_port_t object,
if (pm_entries[i] & PM_PAGINGOUT)
{
pm_entries[i] |= PM_WRITEWAIT;
- condition_wait (&p->wakeup, &p->interlock);
+ pthread_cond_wait (&p->wakeup, &p->interlock);
goto retry;
}
@@ -143,7 +143,7 @@ _pager_do_write_request (mach_port_t object,
/* Let someone else in. */
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
/* This is inefficient; we should send all the pages to the device at once
but until the pager library interface is changed, this will have to do. */
@@ -155,7 +155,7 @@ _pager_do_write_request (mach_port_t object,
data + (vm_page_size * i));
/* Acquire the right to meddle with the pagemap */
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_pagemap_resize (p, offset + length);
pm_entries = &p->pagemap[offset / __vm_page_size];
@@ -196,18 +196,18 @@ _pager_do_write_request (mach_port_t object,
wakeup = 1;
if (wakeup)
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
_pager_allow_termination (p);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
release_out:
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
}
diff --git a/libpager/data-unlock.c b/libpager/data-unlock.c
index 9692f589..02339abb 100644
--- a/libpager/data-unlock.c
+++ b/libpager/data-unlock.c
@@ -36,10 +36,10 @@ _pager_seqnos_memory_object_data_unlock (mach_port_t object,
if (!p)
return EOPNOTSUPP;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
if (p->pager_state != NORMAL)
{
diff --git a/libpager/inhibit-term.c b/libpager/inhibit-term.c
index 222bad5e..3f1e2ffe 100644
--- a/libpager/inhibit-term.c
+++ b/libpager/inhibit-term.c
@@ -31,5 +31,5 @@ void
_pager_allow_termination (struct pager *p)
{
if (!--p->noterm && p->termwaiting)
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
}
diff --git a/libpager/lock-completed.c b/libpager/lock-completed.c
index 1810959f..9ab640fe 100644
--- a/libpager/lock-completed.c
+++ b/libpager/lock-completed.c
@@ -37,7 +37,7 @@ _pager_seqnos_memory_object_lock_completed (mach_port_t object,
if (!p)
return EOPNOTSUPP;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
if (control != p->memobjcntl)
@@ -55,13 +55,13 @@ _pager_seqnos_memory_object_lock_completed (mach_port_t object,
if (lr->locks_pending)
--lr->locks_pending;
if (!lr->locks_pending && !lr->pending_writes)
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
break;
}
out:
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return err;
diff --git a/libpager/lock-object.c b/libpager/lock-object.c
index d8d4a1b7..93c89f07 100644
--- a/libpager/lock-object.c
+++ b/libpager/lock-object.c
@@ -33,10 +33,10 @@ _pager_lock_object (struct pager *p,
int i;
struct lock_request *lr = 0;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
if (p->pager_state != NORMAL)
{
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
return;
}
@@ -74,7 +74,7 @@ _pager_lock_object (struct pager *p,
if (sync)
{
while (lr->locks_pending || lr->pending_writes)
- condition_wait (&p->wakeup, &p->interlock);
+ pthread_cond_wait (&p->wakeup, &p->interlock);
if (! --lr->threads_waiting)
{
@@ -103,5 +103,5 @@ _pager_lock_object (struct pager *p,
}
}
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
}
diff --git a/libpager/mark-error.c b/libpager/mark-error.c
index 5c4e029d..48ceb950 100644
--- a/libpager/mark-error.c
+++ b/libpager/mark-error.c
@@ -103,7 +103,7 @@ pager_get_error (struct pager *p, vm_address_t addr)
{
error_t err;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
addr /= vm_page_size;
@@ -116,7 +116,7 @@ pager_get_error (struct pager *p, vm_address_t addr)
if (! err)
err = _pager_page_errors[PM_ERROR(p->pagemap[addr])];
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
return err;
}
diff --git a/libpager/no-senders.c b/libpager/no-senders.c
index 3c2400c4..223cadd2 100644
--- a/libpager/no-senders.c
+++ b/libpager/no-senders.c
@@ -29,10 +29,10 @@ _pager_do_seqnos_mach_notify_no_senders (mach_port_t notify,
if (!p)
return EOPNOTSUPP;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_no_senders (p, mscount);
diff --git a/libpager/object-init.c b/libpager/object-init.c
index eeb50993..90ffc016 100644
--- a/libpager/object-init.c
+++ b/libpager/object-init.c
@@ -34,7 +34,7 @@ _pager_seqnos_memory_object_init (mach_port_t object,
if (!p)
return EOPNOTSUPP;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
if (pagesize != __vm_page_size)
@@ -72,7 +72,7 @@ _pager_seqnos_memory_object_init (mach_port_t object,
out:
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
diff --git a/libpager/object-terminate.c b/libpager/object-terminate.c
index dc53541c..896e2c20 100644
--- a/libpager/object-terminate.c
+++ b/libpager/object-terminate.c
@@ -33,7 +33,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
if (!p)
return EOPNOTSUPP;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
if (control != p->memobjcntl)
@@ -50,7 +50,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
while (p->noterm)
{
p->termwaiting = 1;
- condition_wait (&p->wakeup, &p->interlock);
+ pthread_cond_wait (&p->wakeup, &p->interlock);
}
/* Destry the ports we received; mark that in P so that it doesn't bother
@@ -78,7 +78,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
out:
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
return 0;
@@ -108,7 +108,7 @@ _pager_free_structure (struct pager *p)
}
if (wakeup)
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
if (p->memobjcntl != MACH_PORT_NULL)
{
diff --git a/libpager/offer-page.c b/libpager/offer-page.c
index aed22197..ef58c4b0 100644
--- a/libpager/offer-page.c
+++ b/libpager/offer-page.c
@@ -28,7 +28,7 @@ pager_offer_page (struct pager *p,
vm_offset_t offset,
vm_address_t buf)
{
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
if (_pager_pagemap_resize (p, offset + vm_page_size))
{
@@ -36,9 +36,9 @@ pager_offer_page (struct pager *p,
while (*pm_entry & PM_INCORE)
{
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
pager_flush_some (p, offset, vm_page_size, 1);
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
}
*pm_entry |= PM_INCORE;
@@ -47,6 +47,6 @@ pager_offer_page (struct pager *p,
precious, MACH_PORT_NULL);
}
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
}
diff --git a/libpager/pager-attr.c b/libpager/pager-attr.c
index cbc1533f..7629f1dc 100644
--- a/libpager/pager-attr.c
+++ b/libpager/pager-attr.c
@@ -30,7 +30,7 @@ pager_change_attributes (struct pager *p,
{
struct attribute_request *ar = 0;
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
/* If there's nothing to do we might be able to return. However,
if the user asked us to wait, and there are pending changes,
@@ -39,7 +39,7 @@ pager_change_attributes (struct pager *p,
if (p->may_cache == may_cache && p->copy_strategy == copy_strategy
&& ! (p->attribute_requests && wait))
{
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
return;
}
@@ -48,7 +48,7 @@ pager_change_attributes (struct pager *p,
if (p->pager_state == NOTINIT)
{
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
return;
}
@@ -83,7 +83,7 @@ pager_change_attributes (struct pager *p,
if (wait)
{
while (ar->attrs_pending)
- condition_wait (&p->wakeup, &p->interlock);
+ pthread_cond_wait (&p->wakeup, &p->interlock);
if (! --ar->threads_waiting)
{
@@ -94,5 +94,5 @@ pager_change_attributes (struct pager *p,
}
}
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
}
diff --git a/libpager/pager-create.c b/libpager/pager-create.c
index 26d1aad2..318c9f15 100644
--- a/libpager/pager-create.c
+++ b/libpager/pager-create.c
@@ -32,8 +32,8 @@ pager_create (struct user_pager_info *upi,
p->upi = upi;
p->pager_state = NOTINIT;
- mutex_init (&p->interlock);
- condition_init (&p->wakeup);
+ pthread_mutex_init (&p->interlock, NULL);
+ pthread_cond_init (&p->wakeup, NULL);
p->lock_requests = 0;
p->attribute_requests = 0;
p->may_cache = may_cache;
diff --git a/libpager/pager-shutdown.c b/libpager/pager-shutdown.c
index b729b3f2..86c70af0 100644
--- a/libpager/pager-shutdown.c
+++ b/libpager/pager-shutdown.c
@@ -25,9 +25,9 @@ pager_shutdown (struct pager *p)
/* Sync and flush pager */
pager_sync (p, 1);
pager_flush (p, 1);
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
p->pager_state = SHUTDOWN;
ports_destroy_right (p);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
}
diff --git a/libpager/priv.h b/libpager/priv.h
index f68c6092..e6b2546b 100644
--- a/libpager/priv.h
+++ b/libpager/priv.h
@@ -21,6 +21,7 @@
#include <mach.h>
#include <hurd.h>
#include <sys/mman.h>
+#include <pthread.h>
#include "pager.h"
#include <hurd/ports.h>
@@ -40,8 +41,8 @@ struct pager
SHUTDOWN, /* ignore all further requests */
} pager_state;
- struct mutex interlock;
- struct condition wakeup;
+ pthread_mutex_t interlock;
+ pthread_cond_t wakeup;
struct lock_request *lock_requests; /* pending lock requests */
struct attribute_request *attribute_requests; /* pending attr requests */
diff --git a/libpager/seqnos.c b/libpager/seqnos.c
index 7d8bcba7..77bfbf21 100644
--- a/libpager/seqnos.c
+++ b/libpager/seqnos.c
@@ -28,7 +28,7 @@ _pager_wait_for_seqno (struct pager *p,
while (seqno != p->seqno + 1)
{
p->waitingforseqno = 1;
- condition_wait (&p->wakeup, &p->interlock);
+ pthread_cond_wait (&p->wakeup, &p->interlock);
}
}
@@ -44,7 +44,7 @@ _pager_release_seqno (struct pager *p,
if (p->waitingforseqno)
{
p->waitingforseqno = 0;
- condition_broadcast (&p->wakeup);
+ pthread_cond_broadcast (&p->wakeup);
}
}
@@ -59,10 +59,10 @@ _pager_update_seqno (mach_port_t object,
p = ports_lookup_port (0, object, _pager_class);
if (p)
{
- mutex_lock (&p->interlock);
+ pthread_mutex_lock (&p->interlock);
_pager_wait_for_seqno (p, seqno);
_pager_release_seqno (p, seqno);
- mutex_unlock (&p->interlock);
+ pthread_mutex_unlock (&p->interlock);
ports_port_deref (p);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 10:34:14 +0000