Attachment 897323 Details for Bug 1099237 – debug hacks

[patch] debug hacks

0001-debug-hacks.patch (text/plain), 3.70 KB, created by Colin Walters on 2014-05-19 21:15:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2014-05-19 21:15:07 UTC

Size: 3.70 KB

patch

obsolete

>From cf398da3c7f51ca8a2ce1b3cc14828a7e31886c5 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Mon, 19 May 2014 07:41:45 -0400
>Subject: [PATCH] debug hacks
>
>---
> com32/lib/syslinux/shuffle.c | 5 -----
> core/fs/fs.c                 | 9 ++++++++-
> core/fs/lib/searchconfig.c   | 1 -
> core/mem/free.c              | 2 ++
> core/mem/malloc.c            | 4 ++++
> 5 files changed, 14 insertions(+), 7 deletions(-)
>
>diff --git a/com32/lib/syslinux/shuffle.c b/com32/lib/syslinux/shuffle.c
>index e9ee6aa..e02d8ce 100644
>--- a/com32/lib/syslinux/shuffle.c
>+++ b/com32/lib/syslinux/shuffle.c
>@@ -134,10 +134,6 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist,
> 	if (syslinux_add_memmap(&rxmap, descaddr, descmem, SMT_RESERVED))
> 	    goto bail;
> 
>-#if DEBUG > 1
>-	syslinux_dump_movelist(stdout, fraglist);
>-#endif
>-
> 	if (syslinux_compute_movelist(&moves, fraglist, rxmap))
> 	    goto bail;
> 
>@@ -155,7 +151,6 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist,
> 
> #if DEBUG > 1
>     dprintf("Final movelist:\n");
>-    syslinux_dump_movelist(stdout, moves);
> #endif
> 
>     syslinux_free_memmap(rxmap);
>diff --git a/core/fs/fs.c b/core/fs/fs.c
>index ad2fb37..532ba4b 100644
>--- a/core/fs/fs.c
>+++ b/core/fs/fs.c
>@@ -84,7 +84,7 @@ void pm_load_config(com32sys_t *regs)
>     err = this_fs->fs_ops->load_config();
> 
>     if (err)
>-	printf("ERROR: No configuration file found\n");
>+	printf("ERROR: No configuration file found, sucker\n");
> 
>     set_flags(regs, err ? EFLAGS_ZF : 0);
> }
>@@ -249,6 +249,8 @@ int searchdir(const char *name)
> 		p++;
> 	    *p++ = '\0';
> 
>+	    printf("lookup %s\n", part);
>+
> 	    if (part[0] == '.' && part[1] == '.' && part[2] == '\0') {
> 		if (inode->parent) {
> 		    put_inode(parent);
>@@ -328,12 +330,15 @@ int searchdir(const char *name)
>     if (!inode)
> 	goto err;
> 
>+    printf("=> inode %u\n", inode->ino);
>+
>     file->inode  = inode;
>     file->offset = 0;
> 
>     return file_to_handle(file);
> 
> err:
>+    printf("=> err\n");
>     put_inode(inode);
>     put_inode(parent);
>     if (pathbuf)
>@@ -432,6 +437,8 @@ void fs_init(com32sys_t *regs)
>     /* Initialize malloc() */
>     mem_init();
> 
>+    printf("in syslinux fs_init\n");
>+
>     /* Default name for the root directory */
>     fs.cwd_name[0] = '/';
> 
>diff --git a/core/fs/lib/searchconfig.c b/core/fs/lib/searchconfig.c
>index 24bfde3..186897f 100644
>--- a/core/fs/lib/searchconfig.c
>+++ b/core/fs/lib/searchconfig.c
>@@ -27,7 +27,6 @@ int search_config(const char *search_directories[], const char *filenames[])
> 		     sf);
> 	    realpath(ConfigName, confignamebuf, FILENAME_MAX);
> 	    regs.edi.w[0] = OFFS_WRT(ConfigName, 0);
>-	    dprintf("Config search: %s\n", ConfigName);
> 	    call16(core_open, &regs, &regs);
> 	    if (!(regs.eflags.l & EFLAGS_ZF)) {
> 		chdir(sd);
>diff --git a/core/mem/free.c b/core/mem/free.c
>index 384f10e..a748325 100644
>--- a/core/mem/free.c
>+++ b/core/mem/free.c
>@@ -68,7 +68,9 @@ void free(void *ptr)
> {
>     struct free_arena_header *ah;
> 
>+#if 0
>     dprintf("free(%p) @ %p\n", ptr, __builtin_return_address(0));
>+#endif
> 
>     if ( !ptr )
>         return;
>diff --git a/core/mem/malloc.c b/core/mem/malloc.c
>index 78f7b41..ec2377f 100644
>--- a/core/mem/malloc.c
>+++ b/core/mem/malloc.c
>@@ -63,8 +63,10 @@ static void *_malloc(size_t size, enum heap heap, malloc_tag_t tag)
>     struct free_arena_header *head = &__malloc_head[heap];
>     void *p = NULL;
> 
>+#if 0
>     dprintf("_malloc(%zu, %u, %u) @ %p = ",
> 	    size, heap, tag, __builtin_return_address(0));
>+#endif
> 
>     if (size) {
> 	/* Add the obligatory arena header, and round up */
>@@ -79,7 +81,9 @@ static void *_malloc(size_t size, enum heap heap, malloc_tag_t tag)
>         }
>     }
> 
>+#if 0
>     dprintf("%p\n", p);
>+#endif
>     return p;
> }
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1099237: 897323 | 897324 | 943183