4.4BSD snapshot (revision 8.1); add 1993 to copyright

[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 5872c51..321b7ea 100644 (file)
--- a/usr/src/sys/vm/vm_object.h
+++ b/usr/src/sys/vm/vm_object.h
@@ -1,13 +1,13 @@
 /* 
 /* 

- * 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.
  *
  * %sccs.include.redist.c%
  *
  *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_object.h 7.7 (Berkeley) %G%
+ *     @(#)vm_object.h 8.1 (Berkeley) %G%

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


@@ -58,7 +58,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;


@@ -100,23 +99,14 @@ 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
+#endif /* KERNEL */

 
 

-#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

 
 #ifdef KERNEL
 vm_object_t     vm_object_allocate __P((vm_size_t));
 
 #ifdef KERNEL
 vm_object_t     vm_object_allocate __P((vm_size_t));


@@ -150,4 +140,4 @@ void                 vm_object_shadow __P((vm_object_t *,
 void            vm_object_shutdown __P((void));
 void            vm_object_terminate __P((vm_object_t));
 #endif
 void            vm_object_shutdown __P((void));
 void            vm_object_terminate __P((vm_object_t));
 #endif

-#endif _VM_OBJECT_
+#endif /* _VM_OBJECT_ */