diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-11-23 16:12:55 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-04-07 14:23:36 +0200 |
| commit | 4241dd5673566a61add85bd9eb52d4ae7db2750a (patch) | |
| tree | 0c7ce8514067068a877d8181544c2870af1dac7d /libports/manage-multithread.c | |
| parent | 785f4aea18b5705e63609001d2aa12871a774804 (diff) | |
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/manage-multithread.c')
| -rw-r--r-- | libports/manage-multithread.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/libports/manage-multithread.c b/libports/manage-multithread.c index 58814d2e..dcb6905d 100644 --- a/libports/manage-multithread.c +++ b/libports/manage-multithread.c @@ -167,7 +167,21 @@ ports_manage_port_operations_multithread (struct port_bucket *bucket, outp->RetCodeType = RetCodeType; outp->RetCode = MIG_BAD_ID; - pi = ports_lookup_port (bucket, inp->msgh_local_port, 0); + if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) == + MACH_MSG_TYPE_PROTECTED_PAYLOAD) + pi = ports_lookup_payload (bucket, inp->msgh_protected_payload, NULL); + else + { + pi = ports_lookup_port (bucket, inp->msgh_local_port, 0); + if (pi) + { + inp->msgh_bits = MACH_MSGH_BITS ( + MACH_MSGH_BITS_REMOTE (inp->msgh_bits), + MACH_MSG_TYPE_PROTECTED_PAYLOAD); + inp->msgh_protected_payload = (unsigned long) pi; + } + } + if (pi) { error_t err = ports_begin_rpc (pi, inp->msgh_id, &link); @@ -203,10 +217,19 @@ ports_manage_port_operations_multithread (struct port_bucket *bucket, void * thread_function (void *arg) { + struct ports_thread thread; int master = (int) arg; int timeout; error_t err; + int synchronized_demuxer (mach_msg_header_t *inp, + mach_msg_header_t *outheadp) + { + int r = internal_demuxer (inp, outheadp); + _ports_thread_quiescent (&bucket->threadpool, &thread); + return r; + } + adjust_priority (__atomic_load_n (&totalthreads, __ATOMIC_RELAXED)); if (hook) @@ -217,10 +240,13 @@ ports_manage_port_operations_multithread (struct port_bucket *bucket, else timeout = thread_timeout; + _ports_thread_online (&bucket->threadpool, &thread); + startover: do - err = mach_msg_server_timeout (internal_demuxer, 0, bucket->portset, + err = mach_msg_server_timeout (synchronized_demuxer, + 0, bucket->portset, timeout ? MACH_RCV_TIMEOUT : 0, timeout); while (err != MACH_RCV_TIMED_OUT); @@ -240,6 +266,7 @@ ports_manage_port_operations_multithread (struct port_bucket *bucket, } __atomic_sub_fetch (&totalthreads, 1, __ATOMIC_RELAXED); } + _ports_thread_offline (&bucket->threadpool, &thread); return NULL; } |