sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-09-17 19:07:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the way vm_object_print() was defined.

Browse Source 
Now it is switched off or on by comments rather than a single #define
This commit is contained in:
Bahadir Balban
2008-10-22 19:53:03 +03:00
parent ec863f5521
commit 616b30cdbf
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/mm0/include/vm_area.h
+1
View File
@@ -234,6 +234,7 @@ struct vm_file *vm_file_create(void);
int vm_file_delete(struct vm_file *f); int vm_file_delete(struct vm_file *f);
int vm_object_delete(struct vm_object *vmo); int vm_object_delete(struct vm_object *vmo);
void vm_object_print(struct vm_object *vmo); void vm_object_print(struct vm_object *vmo);
void vm_object_print1(struct vm_object *vmo);
/* Used for pre-faulting a page from mm0 */ /* Used for pre-faulting a page from mm0 */
int prefault_page(struct tcb *task, unsigned long address, int prefault_page(struct tcb *task, unsigned long address,
tasks/mm0/src/fault.c
+13 -10
View File
@@ -178,7 +178,7 @@ int vma_merge_object(struct vm_object *redundant)
vma_drop_link(last_link); vma_drop_link(last_link);
/* Redundant shadow has no shadows anymore */ /* Redundant shadow has no shadows anymore */
redundant->shadows--; BUG_ON(--redundant->shadows < 0);
/* Delete the redundant shadow along with all its pages. */ /* Delete the redundant shadow along with all its pages. */
vm_object_delete(redundant); vm_object_delete(redundant);
@@ -264,6 +264,9 @@ int vm_object_is_deletable(struct vm_object *obj)
{ {
struct vm_file *f; struct vm_file *f;
printf("%s: Checking: ", __FUNCTION__);
vm_object_print(obj);
if (obj->nlinks != 0) if (obj->nlinks != 0)
return 0; return 0;
@@ -319,7 +322,7 @@ int vma_drop_merge_delete(struct vm_area *vma, struct vm_obj_link *link)
*/ */
if (prev) { if (prev) {
BUG_ON(!(prev->obj->flags & VM_OBJ_SHADOW)); BUG_ON(!(prev->obj->flags & VM_OBJ_SHADOW));
obj->shadows--; BUG_ON(--obj->shadows < 0);
list_del_init(&prev->obj->shref); list_del_init(&prev->obj->shref);
} }
@@ -327,9 +330,9 @@ int vma_drop_merge_delete(struct vm_area *vma, struct vm_obj_link *link)
* If there was an object after, that implies current object * If there was an object after, that implies current object
* is a shadow, deduce it from the object after. * is a shadow, deduce it from the object after.
*/ */
if (next && obj->flags & VM_OBJ_SHADOW) { if (next && (obj->flags & VM_OBJ_SHADOW)) {
BUG_ON(obj->orig_obj != next->obj); BUG_ON(obj->orig_obj != next->obj);
next->obj->shadows--; BUG_ON(--next->obj->shadows < 0);
list_del_init(&obj->shref); list_del_init(&obj->shref);
/* /*
@@ -349,7 +352,7 @@ int vma_drop_merge_delete(struct vm_area *vma, struct vm_obj_link *link)
*/ */
if(vm_object_is_deletable(obj)) { if(vm_object_is_deletable(obj)) {
dprintf("Deleting object:\n"); dprintf("Deleting object:\n");
vm_object_print(obj); // vm_object_print(obj);
vm_object_delete(obj); vm_object_delete(obj);
} }
@@ -369,7 +372,7 @@ int vma_drop_merge_delete(struct vm_area *vma, struct vm_obj_link *link)
obj->nlinks == 1 && obj->nlinks == 1 &&
obj->shadows == 1) { obj->shadows == 1) {
dprintf("Merging object:\n"); dprintf("Merging object:\n");
vm_object_print(obj); // vm_object_print(obj);
vma_merge_object(obj); vma_merge_object(obj);
} }
@@ -485,9 +488,9 @@ struct page *copy_on_write(struct fault_data *fault)
vmo_link->obj->shadows++; vmo_link->obj->shadows++;
dprintf("%s: Created a shadow:\n", __TASKNAME__); dprintf("%s: Created a shadow:\n", __TASKNAME__);
vm_object_print(shadow); // vm_object_print(shadow);
dprintf("%s: Original object:\n", __TASKNAME__); dprintf("%s: Original object:\n", __TASKNAME__);
vm_object_print(shadow->orig_obj); // vm_object_print(shadow->orig_obj);
/* /*
* Add the shadow in front of the original: * Add the shadow in front of the original:
@@ -672,7 +675,7 @@ out_success:
fault->task->tid); fault->task->tid);
dprintf("%s: Mapped 0x%x as writable to tid %d.\n", __TASKNAME__, dprintf("%s: Mapped 0x%x as writable to tid %d.\n", __TASKNAME__,
page_align(fault->address), fault->task->tid); page_align(fault->address), fault->task->tid);
vm_object_print(page->owner); // vm_object_print(page->owner);
return 0; return 0;
} }
@@ -905,7 +908,7 @@ struct page *task_virt_to_page(struct tcb *t, unsigned long virtual)
/* Found it */ /* Found it */
// printf("%s: %s: Found page with file_offset: 0x%x\n", // printf("%s: %s: Found page with file_offset: 0x%x\n",
// __TASKNAME__, __FUNCTION__, page->offset); // __TASKNAME__, __FUNCTION__, page->offset);
vm_object_print(vmo_link->obj); // vm_object_print(vmo_link->obj);
return page; return page;
} }
tasks/mm0/src/vm_object.c
+4 -7
View File
@@ -9,7 +9,6 @@
#include <l4/api/errno.h> #include <l4/api/errno.h>
#include <kmalloc/kmalloc.h> #include <kmalloc/kmalloc.h>
#if defined(DEBUG_FAULT_HANDLING)
void print_cache_pages(struct vm_object *vmo) void print_cache_pages(struct vm_object *vmo)
{ {
struct page *p; struct page *p;
@@ -48,13 +47,9 @@ void vm_object_print(struct vm_object *vmo)
printf("File type: %s\n", ftype); printf("File type: %s\n", ftype);
} }
print_cache_pages(vmo); // print_cache_pages(vmo);
printf("\n"); // printf("\n");
} }
#else
void print_cache_pages(struct vm_object *vmo) { }
void vm_object_print(struct vm_object *vmo) { }
#endif
/* Global list of in-memory vm objects. */ /* Global list of in-memory vm objects. */
LIST_HEAD(vm_object_list); LIST_HEAD(vm_object_list);
@@ -117,6 +112,8 @@ int vm_object_delete(struct vm_object *vmo)
{ {
struct vm_file *f; struct vm_file *f;
// vm_object_print(vmo);
/* Release all pages */ /* Release all pages */
vmo->pager->ops.release_pages(vmo); vmo->pager->ops.release_pages(vmo);