diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-03-03 20:48:20 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-02 17:44:00 +0200 |
| commit | b7cbdde8854ee4c51ec9cd49ce639bd02d646355 (patch) | |
| tree | 7c1cf1b5011763d20584733d2bb7be1b586b667a /libpager/data-return.c | |
| parent | 64b5d358fcaa039ca2e7634aceaa5ed4c3a10cc4 (diff) | |
libpager: fix receiver lookups
Previously, the receiver lookup was done manually in all the server
functions. Use mig translator functions instead.
* libpager/mig-decls.h: New file.
* libpager/mig-mutate.h: Likewise.
* libpager/Makefile (MIGSFLAGS): Include mig-mutate.h.
* libpager/chg-compl.c: Fix receiver lookups.
* libpager/data-request.c: Likewise.
* libpager/data-return.c: Likewise.
* libpager/data-unlock.c: Likewise.
* libpager/lock-completed.c: Likewise.
* libpager/object-init.c: Likewise.
* libpager/object-terminate.c: Likewise.
* libpager/stubs.c: Likewise.
* libpager/seqnos.c (_pager_update_seqno): Move the actual
functionality...
(_pager_update_seqno_p): ... into a new function that can be called
with a pointer to struct pager.
* libpager/priv.h (_pager_update_seqno_p): New declaration.
Diffstat (limited to 'libpager/data-return.c')
| -rw-r--r-- | libpager/data-return.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libpager/data-return.c b/libpager/data-return.c index 6a3b9037..ee6c6e83 100644 --- a/libpager/data-return.c +++ b/libpager/data-return.c @@ -26,7 +26,7 @@ as for _pager_seqnos_memory_object_data_return; the additional INITIALIZING arg identifies which function is calling us. */ kern_return_t -_pager_do_write_request (mach_port_t object, +_pager_do_write_request (struct pager *p, mach_port_seqno_t seqno, mach_port_t control, vm_offset_t offset, @@ -36,7 +36,6 @@ _pager_do_write_request (mach_port_t object, int kcopy, int initializing) { - struct pager *p; short *pm_entries; int npages, i; char *notified; @@ -47,8 +46,8 @@ _pager_do_write_request (mach_port_t object, int wakeup; int omitdata = 0; - p = ports_lookup_port (0, object, _pager_class); - if (!p) + if (!p + || p->port.class != _pager_class) return EOPNOTSUPP; /* Acquire the right to meddle with the pagemap */ @@ -249,19 +248,17 @@ _pager_do_write_request (mach_port_t object, } } - ports_port_deref (p); return 0; release_out: _pager_release_seqno (p, seqno); pthread_mutex_unlock (&p->interlock); - ports_port_deref (p); return 0; } /* Implement pageout call back as described by <mach/memory_object.defs>. */ kern_return_t -_pager_seqnos_memory_object_data_return (mach_port_t object, +_pager_seqnos_memory_object_data_return (struct pager *p, mach_port_seqno_t seqno, mach_port_t control, vm_offset_t offset, @@ -270,6 +267,6 @@ _pager_seqnos_memory_object_data_return (mach_port_t object, int dirty, int kcopy) { - return _pager_do_write_request (object, seqno, control, offset, data, + return _pager_do_write_request (p, seqno, control, offset, data, length, dirty, kcopy, 0); } |