From f878de5006045c849415afffaffc909458b5f6de Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 7 Dec 2014 17:22:31 +0100 Subject: libpager: remove the `seqno' parameters * libpager/Makefile (MIGSFLAGS): Drop `-DSEQNOS'. * libpager/priv.h (struct pager): Drop fields `seqno' and `waitingforseqno'. * libpager/chg-compl.c: Adopt accordingly. * libpager/data-request.c: Likewise. * libpager/data-return.c: Likewise. * libpager/data-unlock.c: Likewise. * libpager/demuxer.c: Likewise. * libpager/lock-completed.c: Likewise. * libpager/no-senders.c: Likewise. * libpager/notify-stubs.c: Likewise. * libpager/object-init.c: Likewise. * libpager/object-terminate.c: Likewise. * libpager/pager-create.c: Likewise. * libpager/stubs.c: Likewise. --- libpager/data-return.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libpager/data-return.c') diff --git a/libpager/data-return.c b/libpager/data-return.c index f16f3238..01f3db2d 100644 --- a/libpager/data-return.c +++ b/libpager/data-return.c @@ -21,13 +21,12 @@ #include #include -/* Worker function used by _pager_seqnos_memory_object_data_return - and _pager_seqnos_memory_object_data_initialize. All args are - as for _pager_seqnos_memory_object_data_return; the additional +/* Worker function used by _pager_S_memory_object_data_return + and _pager_S_memory_object_data_initialize. All args are + as for _pager_S_memory_object_data_return; the additional INITIALIZING arg identifies which function is calling us. */ kern_return_t _pager_do_write_request (struct pager *p, - mach_port_seqno_t seqno, mach_port_t control, vm_offset_t offset, pointer_t data, @@ -113,6 +112,7 @@ _pager_do_write_request (struct pager *p, than we really have to require (because *all* future writes on this object are going to wait for seqno while we wait for the previous write), but the case is relatively infrequent. */ + /* XXX: Is this still needed? */ retry: for (i = 0; i < npages; i++) if (pm_entries[i] & PM_PAGINGOUT) @@ -254,8 +254,7 @@ _pager_do_write_request (struct pager *p, /* Implement pageout call back as described by . */ kern_return_t -_pager_seqnos_memory_object_data_return (struct pager *p, - mach_port_seqno_t seqno, +_pager_S_memory_object_data_return (struct pager *p, mach_port_t control, vm_offset_t offset, pointer_t data, @@ -263,6 +262,6 @@ _pager_seqnos_memory_object_data_return (struct pager *p, int dirty, int kcopy) { - return _pager_do_write_request (p, seqno, control, offset, data, + return _pager_do_write_request (p, control, offset, data, length, dirty, kcopy, 0); } -- cgit v1.2.3