From 3ae1a7c739f28b3bd6ab9a26f8b0f0b7c12be191 Mon Sep 17 00:00:00 2001 From: Thomas Bushnell Date: Tue, 13 Aug 1996 15:04:05 +0000 Subject: *** empty log message *** --- libpager/object-terminate.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'libpager/object-terminate.c') diff --git a/libpager/object-terminate.c b/libpager/object-terminate.c index 8598ab50..4057789f 100644 --- a/libpager/object-terminate.c +++ b/libpager/object-terminate.c @@ -53,6 +53,12 @@ _pager_seqnos_memory_object_terminate (mach_port_t object, condition_wait (&p->wakeup, &p->interlock); } + /* Destry the ports we received; mark that in P so that it doesn't bother + doing it again. */ + mach_port_destroy (mach_task_self (), control); + mach_port_destroy (mach_task_self (), name); + p->memobjcntl = p->memobjname = MACH_PORT_NULL; + _pager_free_structure (p); #ifdef KERNEL_INIT_RACE @@ -104,8 +110,16 @@ _pager_free_structure (struct pager *p) if (wakeup) condition_broadcast (&p->wakeup); - mach_port_deallocate (mach_task_self (), p->memobjcntl); - mach_port_deallocate (mach_task_self (), p->memobjname); + if (p->memobjcntl != MACH_PORT_NULL) + { + mach_port_deallocate (mach_task_self (), p->memobjcntl); + p->memobjcntl = MACH_PORT_NULL; + } + if (p->memobjname != MACH_PORT_NULL) + { + mach_port_deallocate (mach_task_self (), p->memobjname); + p->memobjname = MACH_PORT_NULL; + } /* Free the pagemap */ if (p->pagemapsize) -- cgit v1.2.3