Renamed region functions to not use sp_*

4 files changed, 20 insertions, 21 deletions

diff --git a/include/apos/mem_nodes.h b/include/apos/mem_nodes.h
index a10e4ea..7a3169f 100644
--- a/include/apos/mem_nodes.h
+++ b/include/apos/mem_nodes.h
@@ -6,7 +6,7 @@
 void init_mem_blocks();
 void destroy_mem_blocks();
 
-struct sp_mem *get_mem_node();
-void free_mem_node(struct sp_mem *m);
+struct mem_region *get_mem_node();
+void free_mem_node(struct mem_region *m);
 
 #endif /* MM_NODES_H */
diff --git a/include/apos/mem_regions.h b/include/apos/mem_regions.h
index 35428e1..af6dc52 100644
--- a/include/apos/mem_regions.h
+++ b/include/apos/mem_regions.h
@@ -7,18 +7,18 @@
 #include <arch/vmem.h>
 
 #define mem_container(ptr)\
-	container_of(ptr, struct sp_mem, sp_n)
+	container_of(ptr, struct mem_region, sp_n)
 
-struct sp_reg_root {
+struct mem_region_root {
 	struct sp_root free_regions;
 	struct sp_root used_regions;
 };
 
-struct sp_mem {
+struct mem_region {
 	struct sp_node sp_n;
 
-	struct sp_mem *next;
-	struct sp_mem *prev;
+	struct mem_region *next;
+	struct mem_region *prev;
 
 	char flags;
 
@@ -26,20 +26,22 @@ struct sp_mem {
 	vm_t start;
 };
 
-stat_t sp_mem_init(struct sp_reg_root *r, vm_t start, size_t arena_size);
-vm_t alloc_region(struct sp_reg_root *r, size_t size, size_t *actual_size);
-vm_t alloc_fixed_region(struct sp_reg_root *r, vm_t start, size_t size, size_t *actual_size);
-stat_t free_region(struct sp_reg_root *r, vm_t start);
+stat_t init_region(struct mem_region_root *r, vm_t start, size_t arena_size);
+void destroy_region(struct mem_region_root *r);
 
-struct sp_mem *sp_used_find(struct sp_reg_root *r, vm_t start);
-struct sp_mem *sp_find_used_closest(struct sp_reg_root *r, vm_t start);
-struct sp_mem *sp_find_free(struct sp_reg_root *r, size_t size, size_t *align);
+vm_t alloc_region(struct mem_region_root *r, size_t size, size_t *actual_size);
+vm_t alloc_fixed_region(struct mem_region_root *r, vm_t start, size_t size, size_t *actual_size);
+stat_t free_region(struct mem_region_root *r, vm_t start);
 
-#define MEM_REGION_TRY_AGAIN 1
-typedef stat_t mem_region_callback_t(struct vm_branch *b,
+struct mem_region *find_used_region(struct mem_region_root *r, vm_t start);
+struct mem_region *find_closest_used_region(struct mem_region_root *r, vm_t start);
+struct mem_region *find_free_region(struct mem_region_root *r, size_t size, size_t *align);
+
+#define REGION_TRY_AGAIN 1
+typedef stat_t region_callback_t(struct vm_branch *b,
 		pm_t *offset, vm_t vaddr, vmflags_t flags, enum mm_order order);
 
-vm_t map_fill_region(struct vm_branch *b, mem_region_callback_t *mem_handler,
+vm_t map_fill_region(struct vm_branch *b, region_callback_t *mem_handler,
 		pm_t offset, vm_t start, size_t bytes, vmflags_t flags);
 
 #endif /* APOS_MEM_REGIONS_H */
diff --git a/include/apos/tcb.h b/include/apos/tcb.h
index bd66aff..b2e38a0 100644
--- a/include/apos/tcb.h
+++ b/include/apos/tcb.h
@@ -7,7 +7,7 @@
 
 struct tcb {
 	struct sp_node sp_n;
-	struct sp_reg_root sp_r;
+	struct mem_region_root sp_r;
 	struct arch_tcbd tcbd;
 
 	id_t pid;
diff --git a/include/apos/vmem.h b/include/apos/vmem.h
index 083df87..92e9d61 100644
--- a/include/apos/vmem.h
+++ b/include/apos/vmem.h
@@ -21,7 +21,4 @@ stat_t free_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, vmflags
 #define unmap_freed_region(b, start, bytes)\
 	map_fill_region(b, &free_uvmem_wrapper, 0, start, bytes, 0)
 
-size_t uvmem_size();
-void set_uvmem_size(size_t s);
-
 #endif /* APOS_VMEM_H */