diff options
| author | Maksym Planeta <mcsim.planeta@gmail.com> | 2012-10-08 15:16:13 +0300 |
|---|---|---|
| committer | Maksym Planeta <mcsim.planeta@gmail.com> | 2012-10-08 15:16:13 +0300 |
| commit | 6a08b518a60bd0e9448278f88f6f55681a5b9c6c (patch) | |
| tree | 459b4077663475b39aadce1e9ab407379e21c400 /vm | |
| parent | c3d905cfb9486eb1d2887fe8167f038c57fa0bb6 (diff) | |
Add memory advice attribute to memory object and entry.
* include/mach/vm_advice.h: New file with some definitions used for making
memory advice.
(vm_advice_t): Enumeration that is used to denote memory advice.
(VM_ADVICE_MAX_READAHEAD): New macro, that denotes maximal size of cluster
to be read.
(struct vm_advice_entry): Structure that keeps number of pages to be read
before and after the page where fault occurred for some specific memory
advice.
* Makefrag.am (include_mach_HEADERS): Add file vm_advice.h.
* include/mach/mach_types.h: Include header mach/vm_advice.h.
* vm/vm_map.h: Include mach/vm_advice.h.
(struct vm_map_entry): Add advice to map entry attributes.
* vm/vm_map.c (vm_map_find_entry): Add advice to new entry template.
(vm_map_enter): Likewise.
* vm/vm_object.h: Include mach/vm_advice.h.
(struct vm_object): Add advice to memory object attributes.
* vm/vm_object.c (vm_object_bootstrap): Add advice to object template.
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/vm_map.c | 2 | ||||
| -rw-r--r-- | vm/vm_map.h | 2 | ||||
| -rw-r--r-- | vm/vm_object.c | 1 | ||||
| -rw-r--r-- | vm/vm_object.h | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/vm/vm_map.c b/vm/vm_map.c index c46afc07..22fe0eae 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -652,6 +652,7 @@ kern_return_t vm_map_find_entry(map, address, size, mask, object, o_entry) new_entry->needs_copy = FALSE; new_entry->inheritance = VM_INHERIT_DEFAULT; + new_entry->advice = VM_ADVICE_DEFAULT; new_entry->protection = VM_PROT_DEFAULT; new_entry->max_protection = VM_PROT_ALL; new_entry->wired_count = 1; @@ -986,6 +987,7 @@ kern_return_t vm_map_enter( new_entry->needs_copy = needs_copy; new_entry->inheritance = inheritance; + new_entry->advice = VM_ADVICE_DEFAULT; new_entry->protection = cur_protection; new_entry->max_protection = max_protection; new_entry->wired_count = 0; diff --git a/vm/vm_map.h b/vm/vm_map.h index d5bcf96b..af7588ba 100644 --- a/vm/vm_map.h +++ b/vm/vm_map.h @@ -46,6 +46,7 @@ #include <mach/vm_attributes.h> #include <mach/vm_prot.h> #include <mach/vm_inherit.h> +#include <mach/vm_advice.h> #include <vm/pmap.h> #include <vm/vm_object.h> #include <vm/vm_page.h> @@ -118,6 +119,7 @@ struct vm_map_entry { vm_prot_t protection; /* protection code */ vm_prot_t max_protection; /* maximum protection */ vm_inherit_t inheritance; /* inheritance */ + vm_advice_t advice; /* advice */ unsigned short wired_count; /* can be paged if = 0 */ unsigned short user_wired_count; /* for vm_wire */ struct vm_map_entry *projected_on; /* 0 for normal map entry diff --git a/vm/vm_object.c b/vm/vm_object.c index f1017086..e21ce140 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -283,6 +283,7 @@ void vm_object_bootstrap(void) * permanent object becomes ready */ vm_object_template.use_shared_copy = FALSE; vm_object_template.shadowed = FALSE; + vm_object_template.advice = VM_ADVICE_DEFAULT; vm_object_template.absent_count = 0; vm_object_template.all_wanted = 0; /* all bits FALSE */ diff --git a/vm/vm_object.h b/vm/vm_object.h index c9925709..8ab97699 100644 --- a/vm/vm_object.h +++ b/vm/vm_object.h @@ -40,6 +40,7 @@ #include <mach/memory_object.h> #include <mach/port.h> #include <mach/vm_prot.h> +#include <mach/vm_advice.h> #include <mach/machine/vm_types.h> #include <kern/queue.h> #include <kern/lock.h> @@ -88,6 +89,7 @@ struct vm_object { memory_object_copy_strategy_t copy_strategy; /* How to handle data copy */ + vm_advice_t advice; /* How to handle page faults */ unsigned int absent_count; /* The number of pages that |