diff options
| author | Thomas Bushnell <thomas@gnu.org> | 2000-07-25 19:40:27 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 2000-07-25 19:40:27 +0000 |
| commit | 2f7e8f040f18b7f9bce6879d4b077094aa7d01c0 (patch) | |
| tree | 80be9465da90cda7839b49574a3c232880b8fe49 /libpager/pagemap.c | |
| parent | 0e0bcad3e157579dbeafec933ac6ccbc00a515a3 (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/pagemap.c')
| -rw-r--r-- | libpager/pagemap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libpager/pagemap.c b/libpager/pagemap.c index c6d924c7..b8b3362c 100644 --- a/libpager/pagemap.c +++ b/libpager/pagemap.c @@ -1,5 +1,5 @@ /* Pagemap manipulation for pager library - Copyright (C) 1994, 1997, 1999 Free Software Foundation + Copyright (C) 1994, 1997, 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 @@ -31,12 +31,13 @@ _pager_pagemap_resize (struct pager *p, vm_address_t off) void *newaddr; int newsize = round_page (off); - newaddr = mmap (0, newsize, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); + newaddr = mmap (0, newsize * sizeof (*p->pagemap), + PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); err = (newaddr == (void *) -1) ? errno : 0; if (! err) { - bcopy (p->pagemap, newaddr, p->pagemapsize); - munmap (p->pagemap, p->pagemapsize); + bcopy (p->pagemap, newaddr, p->pagemapsize * sizeof (*p->pagemap)); + munmap (p->pagemap, p->pagemapsize * sizeof (*p->pagemap)); p->pagemap = newaddr; p->pagemapsize = newsize; } |