| vm_meter.c (34961) | vm_meter.c (38517) |
|---|---|
| 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94 | 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94 |
| 34 * $Id: vm_meter.c,v 1.24 1998/03/28 10:33:27 bde Exp $ | 34 * $Id: vm_meter.c,v 1.25 1998/03/30 09:56:49 phk Exp $ |
| 35 */ 36 37#include <sys/param.h> 38#include <sys/proc.h> 39#include <sys/systm.h> 40#include <sys/kernel.h> 41#include <sys/resource.h> 42#include <sys/vmmeter.h> --- 90 unchanged lines hidden (view full) --- 133 totalp = &total; 134 bzero(totalp, sizeof *totalp); 135 /* 136 * Mark all objects as inactive. 137 */ 138 for (object = TAILQ_FIRST(&vm_object_list); 139 object != NULL; 140 object = TAILQ_NEXT(object,object_list)) | 35 */ 36 37#include <sys/param.h> 38#include <sys/proc.h> 39#include <sys/systm.h> 40#include <sys/kernel.h> 41#include <sys/resource.h> 42#include <sys/vmmeter.h> --- 90 unchanged lines hidden (view full) --- 133 totalp = &total; 134 bzero(totalp, sizeof *totalp); 135 /* 136 * Mark all objects as inactive. 137 */ 138 for (object = TAILQ_FIRST(&vm_object_list); 139 object != NULL; 140 object = TAILQ_NEXT(object,object_list)) |
| 141 object->flags &= ~OBJ_ACTIVE; | 141 vm_object_clear_flag(object, OBJ_ACTIVE); |
| 142 /* 143 * Calculate process statistics. 144 */ 145 for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) { 146 if (p->p_flag & P_SYSTEM) 147 continue; 148 switch (p->p_stat) { 149 case 0: --- 26 unchanged lines hidden (view full) --- 176 * Note active objects. 177 */ 178 paging = 0; 179 for (map = &p->p_vmspace->vm_map, entry = map->header.next; 180 entry != &map->header; entry = entry->next) { 181 if ((entry->eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) || 182 entry->object.vm_object == NULL) 183 continue; | 142 /* 143 * Calculate process statistics. 144 */ 145 for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) { 146 if (p->p_flag & P_SYSTEM) 147 continue; 148 switch (p->p_stat) { 149 case 0: --- 26 unchanged lines hidden (view full) --- 176 * Note active objects. 177 */ 178 paging = 0; 179 for (map = &p->p_vmspace->vm_map, entry = map->header.next; 180 entry != &map->header; entry = entry->next) { 181 if ((entry->eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) || 182 entry->object.vm_object == NULL) 183 continue; |
| 184 entry->object.vm_object->flags |= OBJ_ACTIVE; | 184 vm_object_set_flag(entry->object.vm_object, OBJ_ACTIVE); |
| 185 paging |= entry->object.vm_object->paging_in_progress; 186 } 187 if (paging) 188 totalp->t_pw++; 189 } 190 /* 191 * Calculate object memory usage statistics. 192 */ --- 25 unchanged lines hidden --- | 185 paging |= entry->object.vm_object->paging_in_progress; 186 } 187 if (paging) 188 totalp->t_pw++; 189 } 190 /* 191 * Calculate object memory usage statistics. 192 */ --- 25 unchanged lines hidden --- |