diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-27 01:24:30 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-27 01:24:30 +0200 |
| commit | e34814b27b4a5b80761c166d5827d1c9177fd1fe (patch) | |
| tree | 6acd0dc3247162badbc350dcc59c66d00efa7458 | |
| parent | 5c2ab2008137612797ccaa6c07599cc3e0f9e722 (diff) | |
Keep a reference on objects to preserve their content.
Modify tmpfs to keep a reference (by mapping it into its
own space) to each memory object created by the user, so they don't get
inmediately terminated at the end of the current operation.
* tmpfs/tmpfs.h (struct disknode): Add `memref' field.
* tmpfs/node.c (diskfs_get_filemap): vm_map() the first page of the
newly-allocated object, store in `memref' field.
(diskfs_free_node) vm_deallocate the page pointed by `memref' field.
| -rw-r--r-- | tmpfs/node.c | 11 | ||||
| -rw-r--r-- | tmpfs/tmpfs.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tmpfs/node.c b/tmpfs/node.c index 55a45723..c127412e 100644 --- a/tmpfs/node.c +++ b/tmpfs/node.c @@ -61,8 +61,10 @@ diskfs_free_node (struct node *np, mode_t mode) switch (np->dn->type) { case DT_REG: - if (np->dn->u.reg.memobj != MACH_PORT_NULL) + if (np->dn->u.reg.memobj != MACH_PORT_NULL) { + vm_deallocate (mach_task_self (), np->dn->u.reg.memref, 4096); mach_port_deallocate (mach_task_self (), np->dn->u.reg.memobj); + } break; case DT_DIR: assert (np->dn->u.dir.entries == 0); @@ -500,6 +502,13 @@ diskfs_get_filemap (struct node *np, vm_prot_t prot) past the specified size of the file. */ err = default_pager_object_set_size (np->dn->u.reg.memobj, np->allocsize); + assert_perror (err); + + /* XXX we need to keep a reference to the object, or GNU Mach + could try to terminate it while cleaning object cache */ + vm_map (mach_task_self (), &np->dn->u.reg.memref, 4096, 0, 1, + np->dn->u.reg.memobj, 0, 0, VM_PROT_NONE, VM_PROT_NONE, + VM_INHERIT_NONE); } /* XXX always writable */ diff --git a/tmpfs/tmpfs.h b/tmpfs/tmpfs.h index a0e1f7ad..3d38e2ab 100644 --- a/tmpfs/tmpfs.h +++ b/tmpfs/tmpfs.h @@ -47,6 +47,7 @@ struct disknode struct { mach_port_t memobj; + vm_address_t memref; unsigned int allocpages; /* largest size while memobj was live */ } reg; struct |