xnu-1228.tar.gz

[apple/xnu.git] / osfmk / default_pager / dp_memory_object.c

diff --git a/osfmk/default_pager/dp_memory_object.c b/osfmk/default_pager/dp_memory_object.c
index 9a0a2e5c2d79f59b4393150e36dc1d0beb56c4c7..4690f5d3ef750e12c5499a910b1bd1b971b305c0 100644 (file)
--- a/osfmk/default_pager/dp_memory_object.c
+++ b/osfmk/default_pager/dp_memory_object.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -57,11 +60,20 @@
  */
 
 #include "default_pager_internal.h"
  */
 
 #include "default_pager_internal.h"

+#include <default_pager/default_pager_object_server.h>
+#include <mach/memory_object_default_server.h>
+#include <mach/memory_object_control.h>

 #include <mach/memory_object_types.h>
 #include <mach/memory_object_server.h>
 #include <mach/memory_object_types.h>
 #include <mach/memory_object_server.h>

+#include <mach/upl.h>
+#include <mach/vm_map.h>

 #include <vm/memory_object.h>
 #include <vm/vm_pageout.h> 
 #include <vm/memory_object.h>
 #include <vm/vm_pageout.h> 

+#include <vm/vm_map.h>
+#include <vm/vm_protos.h>

 
 

+/* forward declaration */
+vstruct_t vs_object_create(vm_size_t size);

 
 /*
  * List of all vstructs.  A specific vstruct is
 
 /*
  * List of all vstructs.  A specific vstruct is


@@ -107,7 +119,6 @@ static unsigned int default_pager_total = 0;                /* debugging */
 static unsigned int    default_pager_wait_seqno = 0;           /* debugging */
 static unsigned int    default_pager_wait_read = 0;            /* debugging */
 static unsigned int    default_pager_wait_write = 0;           /* debugging */
 static unsigned int    default_pager_wait_seqno = 0;           /* debugging */
 static unsigned int    default_pager_wait_read = 0;            /* debugging */
 static unsigned int    default_pager_wait_write = 0;           /* debugging */

-static unsigned int    default_pager_wait_refs = 0;            /* debugging */

 
 __private_extern__ void
 vs_async_wait(
 
 __private_extern__ void
 vs_async_wait(


@@ -346,11 +357,25 @@ default_pager_add(
 
 #endif
 
 
 #endif
 

+const struct memory_object_pager_ops default_pager_ops = {
+       dp_memory_object_reference,
+       dp_memory_object_deallocate,
+       dp_memory_object_init,
+       dp_memory_object_terminate,
+       dp_memory_object_data_request,
+       dp_memory_object_data_return,
+       dp_memory_object_data_initialize,
+       dp_memory_object_data_unlock,
+       dp_memory_object_synchronize,
+       dp_memory_object_unmap,
+       "default pager"
+};
+

 kern_return_t
 dp_memory_object_init(
        memory_object_t         mem_obj,
        memory_object_control_t control,
 kern_return_t
 dp_memory_object_init(
        memory_object_t         mem_obj,
        memory_object_control_t control,

-       vm_size_t               pager_page_size)
+       __unused vm_size_t pager_page_size)

 {
        vstruct_t               vs;
 
 {
        vstruct_t               vs;
 


@@ -375,7 +400,7 @@ dp_memory_object_synchronize(
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,
        vm_size_t               length,
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,
        vm_size_t               length,

-       vm_sync_t               flags)
+       __unused vm_sync_t              flags)

 {
        vstruct_t       vs;
 
 {
        vstruct_t       vs;
 


@@ -390,7 +415,7 @@ dp_memory_object_synchronize(
 
 kern_return_t
 dp_memory_object_unmap(
 
 kern_return_t
 dp_memory_object_unmap(

-       memory_object_t         mem_obj)
+       __unused memory_object_t                mem_obj)

 {
        panic("dp_memory_object_unmap");
 
 {
        panic("dp_memory_object_unmap");
 


@@ -403,7 +428,6 @@ dp_memory_object_terminate(
 {
        memory_object_control_t control;
        vstruct_t               vs;
 {
        memory_object_control_t control;
        vstruct_t               vs;

-       kern_return_t           kr;

 
        /* 
         * control port is a receive right, not a send right.
 
        /* 
         * control port is a receive right, not a send right.


@@ -464,9 +488,6 @@ dp_memory_object_reference(
        VS_UNLOCK(vs);
 }
 
        VS_UNLOCK(vs);
 }
 

-extern ipc_port_t      max_pages_trigger_port;
-extern int             dp_pages_free;
-extern int             maximum_pages_free;

 void
 dp_memory_object_deallocate(
        memory_object_t         mem_obj)
 void
 dp_memory_object_deallocate(
        memory_object_t         mem_obj)


@@ -561,7 +582,8 @@ dp_memory_object_data_request(
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,
        vm_size_t               length,
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,
        vm_size_t               length,

-       vm_prot_t               protection_required)
+       __unused vm_prot_t      protection_required,
+        memory_object_fault_info_t     fault_info)

 {
        vstruct_t               vs;
 
 {
        vstruct_t               vs;
 


@@ -612,7 +634,7 @@ dp_memory_object_data_request(
        if ((offset & vm_page_mask) != 0 || (length & vm_page_mask) != 0)
                Panic("bad alignment");
 
        if ((offset & vm_page_mask) != 0 || (length & vm_page_mask) != 0)
                Panic("bad alignment");
 

-       pvs_cluster_read(vs, (vm_offset_t)offset, length);
+       pvs_cluster_read(vs, (vm_offset_t)offset, length, fault_info);

 
        vs_finish_read(vs);
 
 
        vs_finish_read(vs);
 


@@ -639,9 +661,9 @@ dp_memory_object_data_initialize(
 {
        vstruct_t       vs;
 
 {
        vstruct_t       vs;
 

-       DEBUG(DEBUG_MO_EXTERNAL,
-             ("mem_obj=0x%x,offset=0x%x,cnt=0x%x\n",
-              (int)mem_obj, (int)offset, (int)size));
+       DP_DEBUG(DEBUG_MO_EXTERNAL,
+                ("mem_obj=0x%x,offset=0x%x,cnt=0x%x\n",
+                 (int)mem_obj, (int)offset, (int)size));

        GSTAT(global_stats.gs_pages_init += atop_32(size));
 
        vs_lookup(mem_obj, vs);
        GSTAT(global_stats.gs_pages_init += atop_32(size));
 
        vs_lookup(mem_obj, vs);


@@ -663,29 +685,33 @@ dp_memory_object_data_initialize(
 
 kern_return_t
 dp_memory_object_data_unlock(
 
 kern_return_t
 dp_memory_object_data_unlock(

-       memory_object_t         mem_obj,
-       memory_object_offset_t  offset,
-       vm_size_t               size,
-       vm_prot_t               desired_access)
+       __unused memory_object_t                mem_obj,
+       __unused memory_object_offset_t offset,
+       __unused vm_size_t              size,
+       __unused vm_prot_t              desired_access)

 {
        Panic("dp_memory_object_data_unlock: illegal");
        return KERN_FAILURE;
 }
 
 
 {
        Panic("dp_memory_object_data_unlock: illegal");
        return KERN_FAILURE;
 }
 
 

+/*ARGSUSED8*/

 kern_return_t
 dp_memory_object_data_return(
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,
 kern_return_t
 dp_memory_object_data_return(
        memory_object_t         mem_obj,
        memory_object_offset_t  offset,

-       vm_size_t               size,
-       boolean_t               dirty,
-       boolean_t               kernel_copy)
+       vm_size_t                       size,
+       __unused memory_object_offset_t *resid_offset,
+       __unused int            *io_error,
+       __unused boolean_t      dirty,
+       __unused boolean_t      kernel_copy,
+       __unused int    upl_flags)

 {
        vstruct_t       vs;
 
 {
        vstruct_t       vs;
 

-       DEBUG(DEBUG_MO_EXTERNAL,
-             ("mem_obj=0x%x,offset=0x%x,size=0x%x\n",
-              (int)mem_obj, (int)offset, (int)size));
+       DP_DEBUG(DEBUG_MO_EXTERNAL,
+                ("mem_obj=0x%x,offset=0x%x,size=0x%x\n",
+                 (int)mem_obj, (int)offset, (int)size));

        GSTAT(global_stats.gs_pageout_calls++);
 
        /* This routine is called by the pageout thread.  The pageout thread */
        GSTAT(global_stats.gs_pageout_calls++);
 
        /* This routine is called by the pageout thread.  The pageout thread */


@@ -704,7 +730,7 @@ dp_memory_object_data_return(
                /* a synchronous interface */
                /* return KERN_LOCK_OWNED; */
                upl_t           upl;
                /* a synchronous interface */
                /* return KERN_LOCK_OWNED; */
                upl_t           upl;

-               int             page_list_count = 0;
+               unsigned int    page_list_count = 0;

                memory_object_super_upl_request(vs->vs_control,
                                        (memory_object_offset_t)offset,
                                        size, size,
                memory_object_super_upl_request(vs->vs_control,
                                        (memory_object_offset_t)offset,
                                        size, size,


@@ -719,8 +745,8 @@ dp_memory_object_data_return(
        if ((vs->vs_seqno != vs->vs_next_seqno++)
                        || (vs->vs_readers)
                        || (vs->vs_xfer_pending)) {
        if ((vs->vs_seqno != vs->vs_next_seqno++)
                        || (vs->vs_readers)
                        || (vs->vs_xfer_pending)) {

-               upl_t   upl;
-               int     page_list_count = 0;
+               upl_t           upl;
+               unsigned int    page_list_count = 0;

 
                vs->vs_next_seqno--;
                 VS_UNLOCK(vs);
 
                vs->vs_next_seqno--;
                 VS_UNLOCK(vs);


@@ -785,7 +811,7 @@ dp_memory_object_data_return(
  */
 kern_return_t
 default_pager_memory_object_create(
  */
 kern_return_t
 default_pager_memory_object_create(

-       memory_object_default_t dmm,
+       __unused memory_object_default_t        dmm,

        vm_size_t               new_size,
        memory_object_t         *new_mem_obj)
 {
        vm_size_t               new_size,
        memory_object_t         *new_mem_obj)
 {


@@ -804,7 +830,7 @@ default_pager_memory_object_create(
         * and this default_pager structure
         */
 
         * and this default_pager structure
         */
 

-       vs->vs_mem_obj = ISVS;
+       vs->vs_pager_ops = &default_pager_ops;

        vs->vs_mem_obj_ikot = IKOT_MEMORY_OBJECT;
 
        /*
        vs->vs_mem_obj_ikot = IKOT_MEMORY_OBJECT;
 
        /*


@@ -822,16 +848,13 @@ default_pager_memory_object_create(
  */
 kern_return_t
 default_pager_object_create(
  */
 kern_return_t
 default_pager_object_create(

-       default_pager_t pager,
+       default_pager_t default_pager,

        vm_size_t       size,
        memory_object_t *mem_objp)
 {
        vstruct_t       vs;
        vm_size_t       size,
        memory_object_t *mem_objp)
 {
        vstruct_t       vs;

-       kern_return_t   result;
-       struct vstruct_alias    *alias_struct;

 
 

-
-       if (pager != default_pager_object)
+       if (default_pager != default_pager_object)

                return KERN_INVALID_ARGUMENT;
 
        vs = vs_object_create(size);
                return KERN_INVALID_ARGUMENT;
 
        vs = vs_object_create(size);


@@ -842,7 +865,7 @@ default_pager_object_create(
         * Set up associations between the default pager
         * and this vstruct structure
         */
         * Set up associations between the default pager
         * and this vstruct structure
         */

-       vs->vs_mem_obj = ISVS;
+       vs->vs_pager_ops = &default_pager_ops;

        vstruct_list_insert(vs);
        *mem_objp = vs_to_mem_obj(vs);
        return KERN_SUCCESS;
        vstruct_list_insert(vs);
        *mem_objp = vs_to_mem_obj(vs);
        return KERN_SUCCESS;


@@ -850,95 +873,59 @@ default_pager_object_create(
 
 kern_return_t
 default_pager_objects(
 
 kern_return_t
 default_pager_objects(

-       default_pager_t                 pager,
+       default_pager_t                 default_pager,

        default_pager_object_array_t    *objectsp,
        mach_msg_type_number_t          *ocountp,
        default_pager_object_array_t    *objectsp,
        mach_msg_type_number_t          *ocountp,

-       memory_object_array_t           *pagersp,
+       mach_port_array_t               *portsp,

        mach_msg_type_number_t          *pcountp)
 {
        vm_offset_t             oaddr = 0;      /* memory for objects */
        vm_size_t               osize = 0;      /* current size */
        default_pager_object_t  * objects;
        mach_msg_type_number_t          *pcountp)
 {
        vm_offset_t             oaddr = 0;      /* memory for objects */
        vm_size_t               osize = 0;      /* current size */
        default_pager_object_t  * objects;

-       unsigned int            opotential;
+       unsigned int            opotential = 0;

 
 

-       vm_offset_t             paddr = 0;      /* memory for pagers */
+       vm_map_copy_t           pcopy = 0;      /* copy handle for pagers */

        vm_size_t               psize = 0;      /* current size */
        memory_object_t         * pagers;
        vm_size_t               psize = 0;      /* current size */
        memory_object_t         * pagers;

-       unsigned int            ppotential;
+       unsigned int            ppotential = 0;

 
        unsigned int            actual;
        unsigned int            num_objects;
        kern_return_t           kr;
        vstruct_t               entry;
 
        unsigned int            actual;
        unsigned int            num_objects;
        kern_return_t           kr;
        vstruct_t               entry;

-/*
-       if (pager != default_pager_default_port)
-               return KERN_INVALID_ARGUMENT;
-*/
-
-       /* start with the inline memory */
-
-       kr = vm_map_copyout(ipc_kernel_map, (vm_offset_t *)&objects, 
-                                               (vm_map_copy_t) *objectsp);
-
-       if (kr != KERN_SUCCESS)
-               return kr;
-
-       osize = round_page_32(*ocountp * sizeof * objects);
-       kr = vm_map_wire(ipc_kernel_map, 
-                       trunc_page_32((vm_offset_t)objects),
-                       round_page_32(((vm_offset_t)objects) + osize), 
-                       VM_PROT_READ|VM_PROT_WRITE, FALSE);
-       osize=0;
-
-       *objectsp = objects;
-       /* we start with the inline space */
-
-
-       num_objects = 0;
-       opotential = *ocountp;
-
-       pagers = (memory_object_t *) *pagersp;
-       ppotential = *pcountp;

 
 

-       VSL_LOCK();
+       if (default_pager != default_pager_object)
+               return KERN_INVALID_ARGUMENT;

 
        /*
         * We will send no more than this many
         */
        actual = vstruct_list.vsl_count;
 
        /*
         * We will send no more than this many
         */
        actual = vstruct_list.vsl_count;

-       VSL_UNLOCK();
-
-       if (opotential < actual) {
-               vm_offset_t     newaddr;
-               vm_size_t       newsize;
-
-               newsize = 2 * round_page_32(actual * sizeof * objects);

 
 

-               kr = vm_allocate(kernel_map, &newaddr, newsize, TRUE);
-               if (kr != KERN_SUCCESS)
-                       goto nomemory;
-
-               oaddr = newaddr;
-               osize = newsize;
-               opotential = osize / sizeof * objects;
-               objects = (default_pager_object_t *)oaddr;
+       /*
+        * Out out-of-line port arrays are simply kalloc'ed.
+        */
+       psize = round_page(actual * sizeof * pagers);
+       ppotential = psize / sizeof * pagers;
+       pagers = (memory_object_t *)kalloc(psize);
+       if (0 == pagers)
+               return KERN_RESOURCE_SHORTAGE;
+               
+       /*
+        * returned out of line data must be allocated out
+        * the ipc_kernel_map, wired down, filled in, and
+        * then "copied in" as if it had been sent by a
+        * user process.
+        */
+       osize = round_page(actual * sizeof * objects);
+       opotential = osize / sizeof * objects;
+       kr = kmem_alloc(ipc_kernel_map, &oaddr, osize);
+       if (KERN_SUCCESS != kr) {
+               kfree(pagers, psize);
+               return KERN_RESOURCE_SHORTAGE;

        }
        }

+       objects = (default_pager_object_t *)oaddr;

 
 

-       if (ppotential < actual) {
-               vm_offset_t     newaddr;
-               vm_size_t       newsize;
-
-               newsize = 2 * round_page_32(actual * sizeof * pagers);
-
-               kr = vm_allocate(kernel_map, &newaddr, newsize, TRUE);
-               if (kr != KERN_SUCCESS)
-                       goto nomemory;
-
-               paddr = newaddr;
-               psize = newsize;
-               ppotential = psize / sizeof * pagers;
-               pagers = (memory_object_t *)paddr;
-       }

 
        /*
         * Now scan the list.
 
        /*
         * Now scan the list.


@@ -949,8 +936,8 @@ default_pager_objects(
        num_objects = 0;
        queue_iterate(&vstruct_list.vsl_queue, entry, vstruct_t, vs_links) {
 
        num_objects = 0;
        queue_iterate(&vstruct_list.vsl_queue, entry, vstruct_t, vs_links) {
 

-               memory_object_t         pager;
-               vm_size_t               size;
+               memory_object_t                 pager;
+               vm_size_t                       size;

 
                if ((num_objects >= opotential) ||
                    (num_objects >= ppotential)) {
 
                if ((num_objects >= opotential) ||
                    (num_objects >= ppotential)) {


@@ -984,7 +971,8 @@ default_pager_objects(
                        VS_UNLOCK(entry);
                        goto not_this_one;
                }
                        VS_UNLOCK(entry);
                        goto not_this_one;
                }

-               dp_memory_object_reference(vs_to_mem_obj(entry));
+               pager = vs_to_mem_obj(entry);
+               dp_memory_object_reference(pager);

                VS_UNLOCK(entry);
 
                /* the arrays are wired, so no deadlock worries */
                VS_UNLOCK(entry);
 
                /* the arrays are wired, so no deadlock worries */


@@ -1006,121 +994,52 @@ default_pager_objects(
 
        VSL_UNLOCK();
 
 
        VSL_UNLOCK();
 

-       /*
-        * Deallocate and clear unused memory.
-        * (Returned memory will automagically become pageable.)
-        */
-
-       if (objects == *objectsp) {
-
-               /*
-                * Our returned information fit inline.
-                * Nothing to deallocate.
-                */
-               *ocountp = num_objects;
-       } else if (actual == 0) {
-               (void) vm_deallocate(kernel_map, oaddr, osize);
-
-               /* return zero items inline */
-               *ocountp = 0;
-       } else {
-               vm_offset_t used;
-
-               used = round_page_32(actual * sizeof * objects);
-
-               if (used != osize)
-                       (void) vm_deallocate(kernel_map,
-                                            oaddr + used, osize - used);
-
-               *objectsp = objects;
-               *ocountp = num_objects;
+       /* clear out any excess allocation */
+       while (num_objects < opotential) {
+               objects[--opotential].dpo_object = (vm_offset_t) 0;
+               objects[opotential].dpo_size = 0;

        }
        }

-
-       if (pagers == (memory_object_t *)*pagersp) {
-
-               /*
-                * Our returned information fit inline.
-                * Nothing to deallocate.
-                */
-
-               *pcountp = num_objects;
-       } else if (actual == 0) {
-               (void) vm_deallocate(kernel_map, paddr, psize);
-
-               /* return zero items inline */
-               *pcountp = 0;
-       } else {
-               vm_offset_t used;
-
-               used = round_page_32(actual * sizeof * pagers);
-
-               if (used != psize)
-                       (void) vm_deallocate(kernel_map,
-                                            paddr + used, psize - used);
-
-               *pagersp = (memory_object_array_t)pagers;
-               *pcountp = num_objects;
+       while (num_objects < ppotential) {
+               pagers[--ppotential] = MEMORY_OBJECT_NULL;

        }
        }

-       (void) vm_map_unwire(kernel_map, (vm_offset_t)objects, 
-                       *ocountp + (vm_offset_t)objects, FALSE); 
-       (void) vm_map_copyin(kernel_map, (vm_offset_t)objects, 
-                       *ocountp, TRUE, (vm_map_copy_t *)objectsp);

 
 

-       return KERN_SUCCESS;
-
-    nomemory:
-       {
-               register int    i;
-               for (i = 0; i < num_objects; i++)
-                       if (pagers[i] != MEMORY_OBJECT_NULL)
-                               memory_object_deallocate(pagers[i]);
-       }
+       kr = vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(oaddr),
+                          vm_map_round_page(oaddr + osize), FALSE);
+       assert(KERN_SUCCESS == kr);
+       kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)oaddr,
+                          (vm_map_size_t)osize, TRUE, &pcopy);
+       assert(KERN_SUCCESS == kr);

 
 

-       if (objects != *objectsp)
-               (void) vm_deallocate(kernel_map, oaddr, osize);
+       *objectsp = (default_pager_object_array_t)objects;
+       *ocountp = num_objects;
+       *portsp = (mach_port_array_t)pcopy;
+       *pcountp = num_objects;

 
 

-       if (pagers != (memory_object_t *)*pagersp)
-               (void) vm_deallocate(kernel_map, paddr, psize);
-
-       return KERN_RESOURCE_SHORTAGE;
+       return KERN_SUCCESS;

 }
 
 kern_return_t
 default_pager_object_pages(
 }
 
 kern_return_t
 default_pager_object_pages(

-       default_pager_t                 pager,
-       memory_object_t                 object,
+       default_pager_t         default_pager,
+       mach_port_t                     memory_object,

        default_pager_page_array_t      *pagesp,
        mach_msg_type_number_t          *countp)
 {
        default_pager_page_array_t      *pagesp,
        mach_msg_type_number_t          *countp)
 {

-       vm_offset_t                     addr;   /* memory for page offsets */
+       vm_offset_t                     addr = 0; /* memory for page offsets */

        vm_size_t                       size = 0; /* current memory size */
        vm_size_t                       size = 0; /* current memory size */

-       default_pager_page_t            * pages;
-       unsigned int                    potential, actual;
+       vm_map_copy_t                   copy;
+       default_pager_page_t            * pages = 0;
+       unsigned int                    potential;
+       unsigned int                    actual;

        kern_return_t                   kr;
        kern_return_t                   kr;

+       memory_object_t                 object;

 
 

-
-       if (pager != default_pager_object)
+       if (default_pager != default_pager_object)

                return KERN_INVALID_ARGUMENT;
 
                return KERN_INVALID_ARGUMENT;
 

-       kr = vm_map_copyout(ipc_kernel_map, (vm_offset_t *)&pages, 
-                                               (vm_map_copy_t) *pagesp);
-
-       if (kr != KERN_SUCCESS)
-               return kr;
-
-       size = round_page_32(*countp * sizeof * pages);
-       kr = vm_map_wire(ipc_kernel_map, 
-                       trunc_page_32((vm_offset_t)pages),
-                       round_page_32(((vm_offset_t)pages) + size), 
-                       VM_PROT_READ|VM_PROT_WRITE, FALSE);
-       size=0;
-
-       *pagesp = pages;
-       /* we start with the inline space */
-
-       addr = (vm_offset_t)pages;
-       potential = *countp;
+       object = (memory_object_t) memory_object;

 
 

+       potential = 0;

        for (;;) {
                vstruct_t       entry;
 
        for (;;) {
                vstruct_t       entry;
 


@@ -1137,9 +1056,9 @@ default_pager_object_pages(
                VSL_UNLOCK();
 
                /* did not find the object */
                VSL_UNLOCK();
 
                /* did not find the object */

+               if (0 != addr)
+                       kmem_free(ipc_kernel_map, addr, size);

 
 

-               if (pages != *pagesp)
-                       (void) vm_deallocate(kernel_map, addr, size);

                return KERN_INVALID_ARGUMENT;
 
            found_object:
                return KERN_INVALID_ARGUMENT;
 
            found_object:


@@ -1150,7 +1069,7 @@ default_pager_object_pages(
 
                        VS_UNLOCK(entry);
 
 
                        VS_UNLOCK(entry);
 

-                       assert_wait_timeout( 1, THREAD_UNINT );
+                       assert_wait_timeout((event_t)assert_wait_timeout, THREAD_UNINT, 1, 1000*NSEC_PER_USEC);

                        wresult = thread_block(THREAD_CONTINUE_NULL);
                        assert(wresult == THREAD_TIMED_OUT);
                        continue;
                        wresult = thread_block(THREAD_CONTINUE_NULL);
                        assert(wresult == THREAD_TIMED_OUT);
                        continue;


@@ -1164,50 +1083,33 @@ default_pager_object_pages(
                        break;
 
                /* allocate more memory */
                        break;
 
                /* allocate more memory */

+               if (0 != addr)
+                       kmem_free(ipc_kernel_map, addr, size);
+
+               size = round_page(actual * sizeof * pages);
+               kr = kmem_alloc(ipc_kernel_map, &addr, size);
+               if (KERN_SUCCESS != kr)
+                       return KERN_RESOURCE_SHORTAGE;

 
 

-               if (pages != *pagesp)
-                       (void) vm_deallocate(kernel_map, addr, size);
-               size = round_page_32(actual * sizeof * pages);
-               kr = vm_allocate(kernel_map, &addr, size, TRUE);
-               if (kr != KERN_SUCCESS)
-                       return kr;

                pages = (default_pager_page_t *)addr;
                potential = size / sizeof * pages;
        }
 
        /*
                pages = (default_pager_page_t *)addr;
                potential = size / sizeof * pages;
        }
 
        /*

-        * Deallocate and clear unused memory.
-        * (Returned memory will automagically become pageable.)
+        * Clear unused memory.

         */
         */

-
-       if (pages == *pagesp) {
-
-               /*
-                * Our returned information fit inline.
-                * Nothing to deallocate.
-                */
-
-               *countp = actual;
-       } else if (actual == 0) {
-               (void) vm_deallocate(kernel_map, addr, size);
-
-               /* return zero items inline */
-               *countp = 0;
-       } else {
-               vm_offset_t used;
-
-               used = round_page_32(actual * sizeof * pages);
-
-               if (used != size)
-                       (void) vm_deallocate(kernel_map,
-                                            addr + used, size - used);
-
-               *pagesp = pages;
-               *countp = actual;
-       }
-       (void) vm_map_unwire(kernel_map, (vm_offset_t)pages, 
-                       *countp + (vm_offset_t)pages, FALSE); 
-       (void) vm_map_copyin(kernel_map, (vm_offset_t)pages, 
-                       *countp, TRUE, (vm_map_copy_t *)pagesp);
+       while (actual < potential)
+               pages[--potential].dpp_offset = 0;
+
+       kr = vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(addr),
+                          vm_map_round_page(addr + size), FALSE);
+       assert(KERN_SUCCESS == kr);
+       kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)addr,
+                          (vm_map_size_t)size, TRUE, &copy);
+       assert(KERN_SUCCESS == kr);
+
+       
+       *pagesp = (default_pager_page_array_t)copy;
+       *countp = actual;

        return KERN_SUCCESS;
 }
        return KERN_SUCCESS;
 }