Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill the indirection via struct shm_handle and store pointer to the uvm 

object direct to _shm_private; the indirection doesn't serve any
useful purpose and just wastes memory and cpu cycles
This commit is contained in:
jdolecek 2004-10-16 13:34:07 +00:00
parent 81c71a86b4
commit 3b6adcdea1
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/sysv_shm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sysv_shm.c,v 1.79 2004/09/28 19:05:19 jdolecek Exp $ */
/* $NetBSD: sysv_shm.c,v 1.80 2004/10/16 13:34:07 jdolecek Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.79 2004/09/28 19:05:19 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.80 2004/10/16 13:34:07 jdolecek Exp $");
#define SYSVSHM
@ -113,10 +113,6 @@ static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments");
static int shm_last_free, shm_nused, shm_committed;
struct shmid_ds *shmsegs;
struct shm_handle {
struct uvm_object *shm_object;
};
struct shmmap_entry {
SLIST_ENTRY(shmmap_entry) next;
vaddr_t va;
@ -180,12 +176,10 @@ static void
shm_deallocate_segment(shmseg)
struct shmid_ds *shmseg;
{
struct shm_handle *shm_handle = shmseg->_shm_internal;
struct uvm_object *uobj = shm_handle->shm_object;
struct uvm_object *uobj = shmseg->_shm_internal;
size_t size = (shmseg->shm_segsz + PGOFSET) & ~PGOFSET;
(*uobj->pgops->pgo_detach)(uobj);
free((caddr_t)shm_handle, M_SHM);
shmseg->_shm_internal = NULL;
shm_committed -= btoc(size);
shmseg->shm_perm.mode = SHMSEG_FREE;
@ -366,7 +360,7 @@ sys_shmat(l, v, retval)
/* This is just a hint to uvm_mmap() about where to put it. */
attach_va = VM_DEFAULT_ADDRESS(p->p_vmspace->vm_daddr, size);
}
uobj = ((struct shm_handle *)shmseg->_shm_internal)->shm_object;
uobj = shmseg->_shm_internal;
(*uobj->pgops->pgo_reference)(uobj);
error = uvm_map(&p->p_vmspace->vm_map, &attach_va, size,
uobj, 0, 0,
@ -526,7 +520,6 @@ shmget_allocate_segment(p, uap, mode, retval)
int i, segnum, shmid, size;
struct ucred *cred = p->p_ucred;
struct shmid_ds *shmseg;
struct shm_handle *shm_handle;
int error = 0;
if (SCARG(uap, size) < shminfo.shmmin ||
@ -556,13 +549,10 @@ shmget_allocate_segment(p, uap, mode, retval)
shmseg->shm_perm.mode = SHMSEG_ALLOCATED | SHMSEG_REMOVED;
shmseg->shm_perm._key = SCARG(uap, key);
shmseg->shm_perm._seq = (shmseg->shm_perm._seq + 1) & 0x7fff;
shm_handle = (struct shm_handle *)
malloc(sizeof(struct shm_handle), M_SHM, M_WAITOK);
shmid = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
shm_handle->shm_object = uao_create(size, 0);
shmseg->_shm_internal = uao_create(size, 0);
shmseg->_shm_internal = shm_handle;
shmseg->shm_perm.cuid = shmseg->shm_perm.uid = cred->cr_uid;
shmseg->shm_perm.cgid = shmseg->shm_perm.gid = cred->cr_gid;
shmseg->shm_perm.mode = (shmseg->shm_perm.mode & SHMSEG_WANTED) |