Deleted Added
full compact
vm_meter.c (42971) vm_meter.c (43748)
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.28 1999/01/21 08:29:11 dillon Exp $
34 * $Id: vm_meter.c,v 1.29 1999/01/21 09:41:52 dillon 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>

--- 132 unchanged lines hidden (view full) ---

175 break;
176 }
177 /*
178 * Note active objects.
179 */
180 paging = 0;
181 for (map = &p->p_vmspace->vm_map, entry = map->header.next;
182 entry != &map->header; entry = entry->next) {
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>

--- 132 unchanged lines hidden (view full) ---

175 break;
176 }
177 /*
178 * Note active objects.
179 */
180 paging = 0;
181 for (map = &p->p_vmspace->vm_map, entry = map->header.next;
182 entry != &map->header; entry = entry->next) {
183 if ((entry->eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) ||
183 if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) ||
184 entry->object.vm_object == NULL)
185 continue;
186 vm_object_set_flag(entry->object.vm_object, OBJ_ACTIVE);
187 paging |= entry->object.vm_object->paging_in_progress;
188 }
189 if (paging)
190 totalp->t_pw++;
191 }

--- 133 unchanged lines hidden ---
184 entry->object.vm_object == NULL)
185 continue;
186 vm_object_set_flag(entry->object.vm_object, OBJ_ACTIVE);
187 paging |= entry->object.vm_object->paging_in_progress;
188 }
189 if (paging)
190 totalp->t_pw++;
191 }

--- 133 unchanged lines hidden ---