BSD 4_4 release

[unix-history] / usr / src / sys / vm / vm_object.h

diff --git a/usr/src/sys/vm/vm_object.h b/usr/src/sys/vm/vm_object.h
index 7af7714..2052cf1 100644 (file)
--- a/usr/src/sys/vm/vm_object.h
+++ b/usr/src/sys/vm/vm_object.h
@@ -1,13 +1,39 @@
 /* 
 /* 

- * Copyright (c) 1991 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  *
  *

- *     @(#)vm_object.h 7.5 (Berkeley) %G%
+ *     @(#)vm_object.h 8.1 (Berkeley) 6/11/93

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -58,7 +84,6 @@ struct vm_object {
        u_short                 paging_in_progress; /* Paging (in or out) so
                                                    don't collapse or destroy */
        simple_lock_data_t      Lock;           /* Synchronization */
        u_short                 paging_in_progress; /* Paging (in or out) so
                                                    don't collapse or destroy */
        simple_lock_data_t      Lock;           /* Synchronization */

-       int                     LockHolder;

        int                     ref_count;      /* How many refs?? */
        vm_size_t               size;           /* Object size */
        int                     resident_page_count;
        int                     ref_count;      /* How many refs?? */
        vm_size_t               size;           /* Object size */
        int                     resident_page_count;


@@ -78,8 +103,6 @@ struct vm_object {
 #define OBJ_INTERNAL   0x0002  /* internally created object */
 #define OBJ_ACTIVE     0x0004  /* used to mark active objects */
 
 #define OBJ_INTERNAL   0x0002  /* internally created object */
 #define OBJ_ACTIVE     0x0004  /* used to mark active objects */
 

-typedef struct vm_object       *vm_object_t;
-

 struct vm_object_hash_entry {
        queue_chain_t           hash_links;     /* hash chain links */
        vm_object_t             object;         /* object we represent */
 struct vm_object_hash_entry {
        queue_chain_t           hash_links;     /* hash chain links */
        vm_object_t             object;         /* object we represent */


@@ -102,51 +125,45 @@ vm_object_t       kmem_object;
 
 #define        vm_object_cache_lock()          simple_lock(&vm_cache_lock)
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)
 
 #define        vm_object_cache_lock()          simple_lock(&vm_cache_lock)
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)

-#endif KERNEL
-
-/*
- *     Declare procedures that operate on VM objects.
- */
-
-void   vm_object_init __P((void));
-void   vm_object_terminate __P((vm_object_t));
-vm_object_t    vm_object_allocate __P((vm_size_t));
-void   vm_object_reference __P((vm_object_t));
-void   vm_object_deallocate __P((vm_object_t));
-void   vm_object_pmap_copy __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_pmap_remove __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_page_remove __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_shadow __P((vm_object_t *, vm_offset_t *, vm_size_t));
-void   vm_object_copy __P((vm_object_t, vm_offset_t, vm_size_t,
-                           vm_object_t *, vm_offset_t *, boolean_t *));
-void   vm_object_collapse __P((vm_object_t));
-vm_object_t    vm_object_lookup __P((vm_pager_t));
-void   vm_object_enter __P((vm_object_t, vm_pager_t));
-void   vm_object_setpager __P((vm_object_t, vm_pager_t,
-                               vm_offset_t, boolean_t));
-#define        vm_object_cache(pager)   pager_cache(vm_object_lookup(pager),TRUE)
-#define        vm_object_uncache(pager) pager_cache(vm_object_lookup(pager),FALSE)
-
-void   vm_object_cache_clear __P((void));
-void   vm_object_print __P((vm_object_t, boolean_t));
+#endif /* KERNEL */

 
 

-void   thread_sleep __P((int, simple_lock_t, boolean_t));
-void   thread_wakeup __P((int));
-
-#if    VM_OBJECT_DEBUG
-#define        vm_object_lock_init(object)     { simple_lock_init(&(object)->Lock); (object)->LockHolder = 0; }
-#define        vm_object_lock(object)          { simple_lock(&(object)->Lock); (object)->LockHolder = (int) current_thread(); }
-#define        vm_object_unlock(object)        { (object)->LockHolder = 0; simple_unlock(&(object)->Lock); }
-#define        vm_object_lock_try(object)      (simple_lock_try(&(object)->Lock) ? ( ((object)->LockHolder = (int) current_thread()) , TRUE) : FALSE)
-#define        vm_object_sleep(event, object, interruptible) \
-                                       { (object)->LockHolder = 0; thread_sleep((event), &(object)->Lock, (interruptible)); }
-#else  VM_OBJECT_DEBUG

 #define        vm_object_lock_init(object)     simple_lock_init(&(object)->Lock)
 #define        vm_object_lock(object)          simple_lock(&(object)->Lock)
 #define        vm_object_unlock(object)        simple_unlock(&(object)->Lock)
 #define        vm_object_lock_try(object)      simple_lock_try(&(object)->Lock)
 #define        vm_object_sleep(event, object, interruptible) \
                                        thread_sleep((event), &(object)->Lock, (interruptible))
 #define        vm_object_lock_init(object)     simple_lock_init(&(object)->Lock)
 #define        vm_object_lock(object)          simple_lock(&(object)->Lock)
 #define        vm_object_unlock(object)        simple_unlock(&(object)->Lock)
 #define        vm_object_lock_try(object)      simple_lock_try(&(object)->Lock)
 #define        vm_object_sleep(event, object, interruptible) \
                                        thread_sleep((event), &(object)->Lock, (interruptible))

-#endif VM_OBJECT_DEBUG

 
 

-#endif _VM_OBJECT_
+#ifdef KERNEL
+vm_object_t     vm_object_allocate __P((vm_size_t));
+void            vm_object_cache_clear __P((void));
+void            vm_object_cache_trim __P((void));
+boolean_t       vm_object_coalesce __P((vm_object_t, vm_object_t,
+                   vm_offset_t, vm_offset_t, vm_offset_t, vm_size_t));
+void            vm_object_collapse __P((vm_object_t));
+void            vm_object_copy __P((vm_object_t, vm_offset_t, vm_size_t,
+                   vm_object_t *, vm_offset_t *, boolean_t *));
+void            vm_object_deactivate_pages __P((vm_object_t));
+void            vm_object_deallocate __P((vm_object_t));
+void            vm_object_enter __P((vm_object_t, vm_pager_t));
+void            vm_object_init __P((vm_size_t));
+vm_object_t     vm_object_lookup __P((vm_pager_t));
+void            vm_object_page_clean __P((vm_object_t,
+                   vm_offset_t, vm_offset_t, boolean_t));
+void            vm_object_page_remove __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_pmap_copy __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_pmap_remove __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_print __P((vm_object_t, boolean_t));
+void            vm_object_reference __P((vm_object_t));
+void            vm_object_remove __P((vm_pager_t));
+void            vm_object_setpager __P((vm_object_t,
+                   vm_pager_t, vm_offset_t, boolean_t));
+void            vm_object_shadow __P((vm_object_t *,
+                   vm_offset_t *, vm_size_t));
+void            vm_object_shutdown __P((void));
+void            vm_object_terminate __P((vm_object_t));
+#endif
+#endif /* _VM_OBJECT_ */