xnu-517.tar.gz

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

diff --git a/osfmk/default_pager/default_pager.c b/osfmk/default_pager/default_pager.c
index 864b9eabd2c5cfbd416b88c80afb98d9070ed3d7..3a6f75c5ad3035ac95abbe9ed3b20d7778fdd5fa 100644 (file)
--- a/osfmk/default_pager/default_pager.c
+++ b/osfmk/default_pager/default_pager.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2001, 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -270,8 +273,8 @@ start_def_pager(char *bs_device)
 /*
        MACH_PORT_FACE          master_device_port;
 */
-       MACH_PORT_FACE          security_port;
 /*
+       MACH_PORT_FACE          security_port;
        MACH_PORT_FACE          root_ledger_wired;
        MACH_PORT_FACE          root_ledger_paged;
 */
@@ -285,8 +288,8 @@ start_def_pager(char *bs_device)
        master_device_port = ipc_port_make_send(master_device_port);
        root_ledger_wired = ipc_port_make_send(root_wired_ledger_port);
        root_ledger_paged = ipc_port_make_send(root_paged_ledger_port);
-*/
        security_port = ipc_port_make_send(realhost.host_security_self);
+*/
 
 
 #if NORMA_VM
@@ -299,6 +302,9 @@ start_def_pager(char *bs_device)
        /* setup read buffers, etc */
        default_pager_initialize();
        default_pager();
+       
+       /* start the backing store monitor, it runs on a callout thread */
+       thread_call_func(default_pager_backing_store_monitor, NULL, FALSE);
 }
 
 /*
@@ -329,8 +335,8 @@ default_pager_info(
 
        bs_global_info(&pages_total, &pages_free);
 
-       infop->dpi_total_space = ptoa(pages_total);
-       infop->dpi_free_space = ptoa(pages_free);
+       infop->dpi_total_space = ptoa_32(pages_total);
+       infop->dpi_free_space = ptoa_32(pages_free);
        infop->dpi_page_size = vm_page_size;
 
        return KERN_SUCCESS;