From 0e3a795af98b6441d0a9928036e140978511e272 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Sun, 22 May 2016 19:35:10 +0200 Subject: libpager: provide 'pager_create_alloc' Add a variant to 'pager_create' that allocates memory for the user hook next to the pager data increasing locality. * console/pager.c (pager_clear_user_data): Fix type of 'idx', do not free 'upi'. (user_pager_create): Use the new function. * doc/hurd.texi: Document new function. * ext2fs/pager.c (pager_clear_user_data): Don't free 'upi'. (diskfs_get_filemap): Use the new function. * fatfs/pager.c (pager_clear_user_data): Don't free 'upi'. (diskfs_get_filemap): Use the new function. * isofs/pager.c (pager_clear_user_data): Don't free 'upi'. (diskfs_get_filemap): Use the new function. * libpager/pager-create.c (_pager_create): New generic allocation function. (pager_create): Use the new generic function. (pager_create_alloc): New function. * libpager/pager.h (pager_create_alloc): New prototype. --- isofs/pager.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'isofs') diff --git a/isofs/pager.c b/isofs/pager.c index b4be4e2d..42cad8db 100644 --- a/isofs/pager.c +++ b/isofs/pager.c @@ -128,7 +128,6 @@ pager_clear_user_data (struct user_pager_info *upi) pthread_spin_unlock (&node2pagelock); diskfs_nrele_light (upi->np); } - free (upi); } void @@ -176,19 +175,20 @@ diskfs_get_filemap (struct node *np, vm_prot_t prot) do if (!np->dn->fileinfo) { - upi = malloc (sizeof (struct user_pager_info)); - upi->type = FILE_DATA; - upi->np = np; - diskfs_nref_light (np); - upi->p = pager_create (upi, pager_bucket, 1, - MEMORY_OBJECT_COPY_DELAY, 0); - if (upi->p == 0) + struct pager *p; + p = pager_create_alloc (sizeof *upi, pager_bucket, 1, + MEMORY_OBJECT_COPY_DELAY, 0); + if (p == NULL) { diskfs_nrele_light (np); - free (upi); pthread_spin_unlock (&node2pagelock); return MACH_PORT_NULL; } + upi = pager_get_upi (p); + upi->type = FILE_DATA; + upi->np = np; + diskfs_nref_light (np); + upi->p = p; np->dn->fileinfo = upi; right = pager_get_port (np->dn->fileinfo->p); ports_port_deref (np->dn->fileinfo->p); -- cgit v1.2.3