summaryrefslogtreecommitdiff
path: root/libports
diff options
context:
space:
mode:
Diffstat (limited to 'libports')
-rw-r--r--libports/bucket-iterate.c6
-rw-r--r--libports/complete-deallocate.c14
-rw-r--r--libports/create-internal.c3
-rw-r--r--libports/get-right.c2
-rw-r--r--libports/import-port.c3
-rw-r--r--libports/lookup-port.c4
-rw-r--r--libports/port-deref-weak.c10
-rw-r--r--libports/port-deref.c34
-rw-r--r--libports/port-ref-weak.c6
-rw-r--r--libports/port-ref.c6
-rw-r--r--libports/ports.h4
-rw-r--r--libports/reallocate-from-external.c2
-rw-r--r--libports/transfer-right.c2
13 files changed, 44 insertions, 52 deletions
diff --git a/libports/bucket-iterate.c b/libports/bucket-iterate.c
index b9ef0eb7..b021b99e 100644
--- a/libports/bucket-iterate.c
+++ b/libports/bucket-iterate.c
@@ -35,13 +35,11 @@ _ports_bucket_class_iterate (struct hurd_ihash *ht,
size_t i, n, nr_items;
error_t err;
- pthread_mutex_lock (&_ports_lock);
pthread_rwlock_rdlock (&_ports_htable_lock);
if (ht->nr_items == 0)
{
pthread_rwlock_unlock (&_ports_htable_lock);
- pthread_mutex_unlock (&_ports_lock);
return 0;
}
@@ -50,7 +48,6 @@ _ports_bucket_class_iterate (struct hurd_ihash *ht,
if (p == NULL)
{
pthread_rwlock_unlock (&_ports_htable_lock);
- pthread_mutex_unlock (&_ports_lock);
return ENOMEM;
}
@@ -61,13 +58,12 @@ _ports_bucket_class_iterate (struct hurd_ihash *ht,
if (class == 0 || pi->class == class)
{
- pi->refcnt++;
+ refcounts_ref (&pi->refcounts, NULL);
p[n] = pi;
n++;
}
}
pthread_rwlock_unlock (&_ports_htable_lock);
- pthread_mutex_unlock (&_ports_lock);
if (n != 0 && n != nr_items)
{
diff --git a/libports/complete-deallocate.c b/libports/complete-deallocate.c
index 4768dab9..0d852f57 100644
--- a/libports/complete-deallocate.c
+++ b/libports/complete-deallocate.c
@@ -29,15 +29,29 @@ _ports_complete_deallocate (struct port_info *pi)
if (pi->port_right)
{
+ struct references result;
+
pthread_rwlock_wrlock (&_ports_htable_lock);
+ refcounts_references (&pi->refcounts, &result);
+ if (result.hard > 0 || result.weak > 0)
+ {
+ /* A reference was reacquired through a hash table lookup.
+ It's fine, we didn't touch anything yet. */
+ pthread_mutex_unlock (&_ports_htable_lock);
+ return;
+ }
+
hurd_ihash_locp_remove (&_ports_htable, pi->ports_htable_entry);
hurd_ihash_locp_remove (&pi->bucket->htable, pi->hentry);
pthread_rwlock_unlock (&_ports_htable_lock);
+
mach_port_mod_refs (mach_task_self (), pi->port_right,
MACH_PORT_RIGHT_RECEIVE, -1);
pi->port_right = MACH_PORT_NULL;
}
+ pthread_mutex_lock (&_ports_lock);
+
pi->bucket->count--;
pi->class->count--;
diff --git a/libports/create-internal.c b/libports/create-internal.c
index 8543986b..2d85931c 100644
--- a/libports/create-internal.c
+++ b/libports/create-internal.c
@@ -54,8 +54,7 @@ _ports_create_port_internal (struct port_class *class,
}
pi->class = class;
- pi->refcnt = 1;
- pi->weakrefcnt = 0;
+ refcounts_init (&pi->refcounts, 1, 0);
pi->cancel_threshold = 0;
pi->mscount = 0;
pi->flags = 0;
diff --git a/libports/get-right.c b/libports/get-right.c
index 89050c6b..8681f465 100644
--- a/libports/get-right.c
+++ b/libports/get-right.c
@@ -41,7 +41,7 @@ ports_get_right (void *port)
if ((pi->flags & PORT_HAS_SENDRIGHTS) == 0)
{
pi->flags |= PORT_HAS_SENDRIGHTS;
- pi->refcnt++;
+ refcounts_ref (&pi->refcounts, NULL);
err = mach_port_request_notification (mach_task_self (),
pi->port_right,
MACH_NOTIFY_NO_SENDERS,
diff --git a/libports/import-port.c b/libports/import-port.c
index 26606720..c337c856 100644
--- a/libports/import-port.c
+++ b/libports/import-port.c
@@ -48,8 +48,7 @@ ports_import_port (struct port_class *class, struct port_bucket *bucket,
return ENOMEM;
pi->class = class;
- pi->refcnt = 1 + !!stat.mps_srights;
- pi->weakrefcnt = 0;
+ refcounts_init (&pi->refcounts, 1 + !!stat.mps_srights, 0);
pi->cancel_threshold = 0;
pi->mscount = stat.mps_mscount;
pi->flags = stat.mps_srights ? PORT_HAS_SENDRIGHTS : 0;
diff --git a/libports/lookup-port.c b/libports/lookup-port.c
index 858ee112..2f0eee9d 100644
--- a/libports/lookup-port.c
+++ b/libports/lookup-port.c
@@ -28,7 +28,6 @@ ports_lookup_port (struct port_bucket *bucket,
{
struct port_info *pi;
- pthread_mutex_lock (&_ports_lock);
pthread_rwlock_rdlock (&_ports_htable_lock);
pi = hurd_ihash_find (&_ports_htable, port);
@@ -38,10 +37,9 @@ ports_lookup_port (struct port_bucket *bucket,
pi = 0;
if (pi)
- pi->refcnt++;
+ refcounts_unsafe_ref (&pi->refcounts, NULL);
pthread_rwlock_unlock (&_ports_htable_lock);
- pthread_mutex_unlock (&_ports_lock);
return pi;
}
diff --git a/libports/port-deref-weak.c b/libports/port-deref-weak.c
index beb48423..8432660c 100644
--- a/libports/port-deref-weak.c
+++ b/libports/port-deref-weak.c
@@ -25,12 +25,8 @@ void
ports_port_deref_weak (void *portstruct)
{
struct port_info *pi = portstruct;
-
- pthread_mutex_lock (&_ports_lock);
- assert (pi->weakrefcnt);
- pi->weakrefcnt--;
- if (pi->refcnt == 0 && pi->weakrefcnt == 0)
+ struct references result;
+ refcounts_deref_weak (&pi->refcounts, &result);
+ if (result.hard == 0 && result.weak == 0)
_ports_complete_deallocate (pi);
- else
- pthread_mutex_unlock (&_ports_lock);
}
diff --git a/libports/port-deref.c b/libports/port-deref.c
index cf9b2383..b97dd13d 100644
--- a/libports/port-deref.c
+++ b/libports/port-deref.c
@@ -25,26 +25,24 @@ void
ports_port_deref (void *portstruct)
{
struct port_info *pi = portstruct;
- int trieddroppingweakrefs = 0;
-
- retry:
-
- pthread_mutex_lock (&_ports_lock);
-
- if (pi->refcnt == 1 && pi->weakrefcnt
- && pi->class->dropweak_routine && !trieddroppingweakrefs)
+ struct references result;
+
+ if (pi->class->dropweak_routine)
{
- pthread_mutex_unlock (&_ports_lock);
- (*pi->class->dropweak_routine) (pi);
- trieddroppingweakrefs = 1;
- goto retry;
+ /* If we need to call the dropweak routine, we need to hold one
+ reference while doing so. We use a weak reference for this
+ purpose, which we acquire by demoting our hard reference to a
+ weak one. */
+ refcounts_demote (&pi->refcounts, &result);
+
+ if (result.hard == 0 && result.weak > 1)
+ (*pi->class->dropweak_routine) (pi);
+
+ refcounts_deref_weak (&pi->refcounts, &result);
}
-
- assert (pi->refcnt);
+ else
+ refcounts_deref (&pi->refcounts, &result);
- pi->refcnt--;
- if (pi->refcnt == 0 && pi->weakrefcnt == 0)
+ if (result.hard == 0 && result.weak == 0)
_ports_complete_deallocate (pi);
- else
- pthread_mutex_unlock (&_ports_lock);
}
diff --git a/libports/port-ref-weak.c b/libports/port-ref-weak.c
index c7d3c690..3f62dfed 100644
--- a/libports/port-ref-weak.c
+++ b/libports/port-ref-weak.c
@@ -25,9 +25,5 @@ void
ports_port_ref_weak (void *portstruct)
{
struct port_info *pi = portstruct;
-
- pthread_mutex_lock (&_ports_lock);
- assert (pi->refcnt || pi->weakrefcnt);
- pi->weakrefcnt++;
- pthread_mutex_unlock (&_ports_lock);
+ refcounts_ref_weak (&pi->refcounts, NULL);
}
diff --git a/libports/port-ref.c b/libports/port-ref.c
index 92b71183..9a1c71e6 100644
--- a/libports/port-ref.c
+++ b/libports/port-ref.c
@@ -25,9 +25,5 @@ void
ports_port_ref (void *portstruct)
{
struct port_info *pi = portstruct;
-
- pthread_mutex_lock (&_ports_lock);
- assert (pi->refcnt || pi->weakrefcnt);
- pi->refcnt++;
- pthread_mutex_unlock (&_ports_lock);
+ refcounts_ref (&pi->refcounts, NULL);
}
diff --git a/libports/ports.h b/libports/ports.h
index 8118de9e..652edb88 100644
--- a/libports/ports.h
+++ b/libports/ports.h
@@ -27,6 +27,7 @@
#include <hurd/ihash.h>
#include <mach/notify.h>
#include <pthread.h>
+#include <refcount.h>
/* These are global values for common flags used in the various structures.
Not all of these are meaningful in all flag fields. */
@@ -39,8 +40,7 @@
struct port_info
{
struct port_class *class;
- int refcnt;
- int weakrefcnt;
+ refcounts_t refcounts;
mach_port_mscount_t mscount;
mach_msg_seqno_t cancel_threshold;
int flags;
diff --git a/libports/reallocate-from-external.c b/libports/reallocate-from-external.c
index 9944b396..7205bd9b 100644
--- a/libports/reallocate-from-external.c
+++ b/libports/reallocate-from-external.c
@@ -56,7 +56,7 @@ ports_reallocate_from_external (void *portstruct, mach_port_t receive)
else if (((pi->flags & PORT_HAS_SENDRIGHTS) == 0) && stat.mps_srights)
{
pi->flags |= PORT_HAS_SENDRIGHTS;
- pi->refcnt++;
+ refcounts_ref (&pi->refcounts, NULL);
}
pi->port_right = receive;
diff --git a/libports/transfer-right.c b/libports/transfer-right.c
index 3f482905..776a8d2b 100644
--- a/libports/transfer-right.c
+++ b/libports/transfer-right.c
@@ -72,7 +72,7 @@ ports_transfer_right (void *tostruct,
else if (((topi->flags & PORT_HAS_SENDRIGHTS) == 0) && hassendrights)
{
topi->flags |= PORT_HAS_SENDRIGHTS;
- topi->refcnt++;
+ refcounts_ref (&topi->refcounts, NULL);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 07:03:56 +0000