summaryrefslogtreecommitdiff
path: root/libpager/object-terminate.c
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>2000-07-25 19:40:27 +0000
committerThomas Bushnell <thomas@gnu.org>2000-07-25 19:40:27 +0000
commit2f7e8f040f18b7f9bce6879d4b077094aa7d01c0 (patch)
tree80be9465da90cda7839b49574a3c232880b8fe49 /libpager/object-terminate.c
parent0e0bcad3e157579dbeafec933ac6ccbc00a515a3 (diff)
2000-07-25 Thomas Bushnell, BSG <tb@mit.edu>
* priv.h (PM_WRITEWAIT): New pagemap bit. * data-return.c (_pager_do_write_request): Don't proceed with a pageout if one is already in progress. Once we finish, wake up any potential PM_WRITEWAIT waiters. * priv.h (PM_INIT): Provide value again. * data-return.c (_pager_do_write_request): Track PM_INIT again. * priv.h (struct pager): Make pagemap consist of 16-bit elements instead of only 8 bits. * data-request.c (_pager_seqnos_memory_object_data_request): Make PM_ENTRY a short pointer. * data-return.c (_pager_do_write_request): Make PM_ENTRIES a short pointer. * lock-object.c (_pager_lock_object): Make PM_ENTRIES a short pointer. * mark-error.c (_pager_mark_next_request_error): Make P a short pointer. (_pager_mark_object_error): Likewise. * offer-page.c (pager_offer_page): Make PM_ENTRY a short pointer. * object-terminate.c (_pager_free_structure): Interpret pagemapsize correctly. * pagemap.c (_pager_pagemap_resize): Likewise.
Diffstat (limited to 'libpager/object-terminate.c')
-rw-r--r--libpager/object-terminate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpager/object-terminate.c b/libpager/object-terminate.c
index 4315cbbb..dc53541c 100644
--- a/libpager/object-terminate.c
+++ b/libpager/object-terminate.c
@@ -1,5 +1,5 @@
/* Implementation of memory_object_terminate for pager library
- Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation
+ Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -124,7 +124,7 @@ _pager_free_structure (struct pager *p)
/* Free the pagemap */
if (p->pagemapsize)
{
- munmap (p->pagemap, p->pagemapsize);
+ munmap (p->pagemap, p->pagemapsize * sizeof (* p->pagemap));
p->pagemapsize = 0;
p->pagemap = 0;
}