Page MenuHomeFreeBSD
Files F141078208

D17794.id49861.diff
No OneTemporary
Actions

D17794.id49861.diff
View Options

Index: sys/vm/vm_map.h
===================================================================
--- sys/vm/vm_map.h
+++ sys/vm/vm_map.h
@@ -106,7 +106,6 @@
vm_offset_t start; /* start address */
vm_offset_t end; /* end address */
vm_offset_t next_read; /* vaddr of the next sequential read */
- vm_size_t adj_free; /* amount of adjacent free space */
vm_size_t max_free; /* max free space in subtree */
union vm_map_object object; /* object I point to */
vm_ooffset_t offset; /* offset into object */
Index: sys/vm/vm_map.c
===================================================================
--- sys/vm/vm_map.c
+++ sys/vm/vm_map.c
@@ -868,12 +868,13 @@
static inline void
vm_map_entry_set_max_free(vm_map_entry_t entry)
{
+ vm_size_t max_left, max_right;
- entry->max_free = entry->adj_free;
- if (entry->left != NULL && entry->left->max_free > entry->max_free)
- entry->max_free = entry->left->max_free;
- if (entry->right != NULL && entry->right->max_free > entry->max_free)
- entry->max_free = entry->right->max_free;
+ max_left = (entry->left != NULL) ? entry->left->max_free :
+ entry->start - entry->prev->end;
+ max_right = (entry->right != NULL) ? entry->right->max_free :
+ entry->next->start - entry->end;
+ entry->max_free = MAX(max_left, max_right);
}
/*
@@ -1022,13 +1023,11 @@
entry->right = after_where->right;
entry->left = after_where;
after_where->right = NULL;
- after_where->adj_free = entry->start - after_where->end;
vm_map_entry_set_max_free(after_where);
} else {
entry->right = map->root;
entry->left = NULL;
}
- entry->adj_free = entry->next->start - entry->end;
vm_map_entry_set_max_free(entry);
map->root = entry;
}
@@ -1047,7 +1046,6 @@
else {
root = vm_map_entry_splay(entry->start, entry->left);
root->right = entry->right;
- root->adj_free = entry->next->start - root->end;
vm_map_entry_set_max_free(root);
}
map->root = root;
@@ -1083,7 +1081,6 @@
if (entry != map->root)
map->root = vm_map_entry_splay(entry->start, map->root);
- entry->adj_free = entry->next->start - entry->end;
vm_map_entry_set_max_free(entry);
}
@@ -1380,11 +1377,11 @@
* Find the first fit (lowest VM address) for "length" free bytes
* beginning at address >= start in the given map.
*
- * In a vm_map_entry, "adj_free" is the amount of free space
- * adjacent (higher address) to this entry, and "max_free" is the
- * maximum amount of contiguous free space in its subtree. This
- * allows finding a free region in one path down the tree, so
- * O(log n) amortized with splay trees.
+ * In a vm_map_entry, "max_free" is the maximum amount of
+ * contiguous free space between an entry in its subtree and a
+ * neighbor of that entry. This allows finding a free region in
+ * one path down the tree, so O(log n) amortized with splay
+ * trees.
*
* The map must be locked, and leaves it so.
*
@@ -1428,7 +1425,7 @@
* wrap might be a problem.
*/
st = (start > map->root->end) ? start : map->root->end;
- if (length <= map->root->end + map->root->adj_free - st) {
+ if (length <= map->root->next->start - st) {
*addr = st;
return (0);
}
@@ -1446,11 +1443,16 @@
while (entry != NULL) {
if (entry->left != NULL && entry->left->max_free >= length)
entry = entry->left;
- else if (entry->adj_free >= length) {
- *addr = entry->end;
+ else if (entry->left == NULL &&
+ entry->start - entry->prev->end >= length) {
+ *addr = entry->prev->end;
return (0);
- } else
+ } else if (entry->right != NULL)
entry = entry->right;
+ else {
+ *addr = entry->end;
+ return (0);
+ }
}
/* Can't get here, so panic if we do. */

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 2:19 PM (2 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27438183
Default Alt Text
D17794.id49861.diff (3 KB)

Event Timeline