aboutsummaryrefslogtreecommitdiff
path: root/libports/complete-deallocate.c
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2013-11-23 16:12:55 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-04-07 14:23:36 +0200
commit4241dd5673566a61add85bd9eb52d4ae7db2750a (patch)
tree0c7ce8514067068a877d8181544c2870af1dac7d /libports/complete-deallocate.c
parent785f4aea18b5705e63609001d2aa12871a774804 (diff)
downloadhurd-4241dd5673566a61add85bd9eb52d4ae7db2750a.tar.gz
hurd-4241dd5673566a61add85bd9eb52d4ae7db2750a.tar.bz2
hurd-4241dd5673566a61add85bd9eb52d4ae7db2750a.zip
libports: use protected payloads to optimize the object lookup
* NEWS: Mention protected payloads. * libports/Makefile (SRCS): Add `port-deref-deferred.c'. * libports/create-internal.c (_ports_create_port_internal): Set the protected payload to the objects address. * libports/import-port.c (ports_import_port): Likewise. * libports/reallocate-from-external.c (ports_reallocate_from_external): Likewise. * libports/reallocate-port.c (ports_reallocate_port): Likewise. * libports/transfer-right.c (ports_transfer_right): Likewise. * libports/manage-multithread.c (ports_manage_port_operations_multithread): Use the protected payload for the object lookup if provided. Add thread pool management calls. * libports/manage-one-thread.c (ports_manage_port_operations_one_thread): Likewise. * libports/destroy-right.c (ports_destroy_right): Defer the dereferencing of outstanding send rights to avoid a port_info use-after-free. * libports/port-deref-deferred.c: New file. * libports/port-deref-deferred.h: Likewise. * libports/ports.h (struct port_bucket): New field `threadpool'. (ports_lookup_payload): Check `port_right'.
Diffstat (limited to 'libports/complete-deallocate.c')
-rw-r--r--libports/complete-deallocate.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libports/complete-deallocate.c b/libports/complete-deallocate.c
index 0d852f57..e3123b26 100644
--- a/libports/complete-deallocate.c
+++ b/libports/complete-deallocate.c
@@ -27,7 +27,7 @@ _ports_complete_deallocate (struct port_info *pi)
{
assert ((pi->flags & PORT_HAS_SENDRIGHTS) == 0);
- if (pi->port_right)
+ if (MACH_PORT_VALID (pi->port_right))
{
struct references result;
@@ -37,7 +37,9 @@ _ports_complete_deallocate (struct port_info *pi)
{
/* A reference was reacquired through a hash table lookup.
It's fine, we didn't touch anything yet. */
- pthread_mutex_unlock (&_ports_htable_lock);
+ /* XXX: This really shouldn't happen. */
+ assert (! "reacquired reference w/o send rights");
+ pthread_rwlock_unlock (&_ports_htable_lock);
return;
}