Skip to content

get metadata of k_page in o(1) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shehapp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

get metadata of k_page in o(1) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions inc/memlayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ struct FrameInfo {
struct Env *environment;
unsigned char isBuffered;
struct WorkingSetElement *element;
//2023
struct K_heap_sh *page_meta_data;
};

#endif /* !__ASSEMBLER__ */
Expand Down
22 changes: 6 additions & 16 deletions kern/mem/kheap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ void* kmalloc(unsigned int size) {
for ( uint32 g=needed_pages; g > 0; i = i + PAGE_SIZE, g--) {

struct FrameInfo *pll = NULL;

allocate_frame(&pll);
pll->page_meta_data=page;
pll->va=i;
map_frame(ptr_page_directory, pll, (int) i, PERM_WRITEABLE | PERM_PRESENT);

Expand Down Expand Up @@ -370,15 +370,7 @@ void kfree(void* virtual_address)

if(virtual_address>= kernel_limit&& virtual_address<=(void*)KERNEL_HEAP_MAX){

struct K_heap_sh *cur_free;
LIST_FOREACH(cur_free, &hlist){

//serach for exact virtual address
if((void*)cur_free->vir_addf==virtual_address)
break;
}


struct K_heap_sh *cur_free=get_K_heap_sh(virtual_address);


struct K_heap_sh *cur_free_prev=NULL;
Expand Down Expand Up @@ -791,10 +783,8 @@ uint8 realloc_in_myPlace(void *virtual_address, unsigned int new_size){
}

void *get_K_heap_sh(void *virtual_address){
struct K_heap_sh *cur;
LIST_FOREACH(cur, &hlist){
if((void*)cur->vir_addf==virtual_address)
break;
}
return cur;
uint32 *ptr_page_table;
struct FrameInfo* ptr_frame_info = get_frame_info(ptr_page_directory,(uint32)virtual_address, &ptr_page_table);
if( ptr_frame_info == 0 )return NULL;
return ptr_frame_info->page_meta_data;
}
1 change: 1 addition & 0 deletions kern/mem/memory_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ void unmap_frame(uint32 *ptr_page_directory, uint32 virtual_address)
struct FrameInfo* ptr_frame_info = get_frame_info(ptr_page_directory, virtual_address, &ptr_page_table);
if( ptr_frame_info != 0 )
{
ptr_frame_info->page_meta_data=NULL;
if (ptr_frame_info->isBuffered && !CHECK_IF_KERNEL_ADDRESS((uint32)virtual_address))
cprintf("WARNING: Freeing BUFFERED frame at va %x!!!\n", virtual_address) ;
decrement_references(ptr_frame_info);
Expand Down