Merge r1766160 from trunk:

[apache] / .gdbinit

diff --git a/.gdbinit b/.gdbinit
index 5b483e6616093f7f11c8ebc827d16ecac7c8c174..6b3f9b72a494548bc0490d29e66126a1e185847d 100644 (file)
--- a/.gdbinit
+++ b/.gdbinit
@@ -290,7 +290,9 @@ define dump_filter_chain
         printf "  %s(0x%lx): type=%d, ctx=0x%lx, r=%s(0x%lx), c=0x%lx\n", \
           $f->frec->name, (unsigned long)$f, $f->frec->ftype, (unsigned long)$f->ctx, \
           $f->r == $r ? "r" : ($f->r == 0L ? "null" : \
-          ($f->r == $r->main ? "r->main" : "????")), $f->r, $f->c
+          ($f->r == $r->main ? "r->main" :  \
+          ($r->main && $f->r == $r->main->main ? "r->main->main" : "????"))), \
+          $f->r, $f->c
 
         set $f = $f->next
     end
@@ -331,29 +333,61 @@ document dump_servers
     Print server_rec list info
 end
 
+define dump_request_tree
+    set $r = $arg0
+    set $i
+    while $r
+        printf "r=(0x%lx): uri=%s, handler=%s, r->main=0x%lx\n", \
+          $r, $r->unparsed_uri, $r->handler ? $r->handler : "(none)", $r->main
+        set $r = $r->main
+    end
+end        
+
 define dump_allocator
     printf "Allocator current_free_index = %d, max_free_index = %d\n", \
             ($arg0)->current_free_index, ($arg0)->max_free_index
     printf "Allocator free list:\n"
     set $i = 0
     set $max =(sizeof $arg0->free)/(sizeof $arg0->free[0])
+    set $kb = 0
     while $i < $max
         set $node = $arg0->free[$i]
         if $node != 0
             printf " #%2d: ", $i
             while $node != 0
-                printf "%d, ", $node->endp - $node->first_avail
+                printf "%d, ", 4096 << $node->index
+                set $kb = $kb + (4 << $node->index)
                 set $node = $node->next
             end
             printf "ends.\n"
         end
         set $i = $i + 1
     end
+    printf "Sum of free blocks: %dkiB\n", $kb
 end
 document dump_allocator
     Print status of an allocator and its freelists.
 end
 
+define dump_one_pool
+    set $p = $arg0
+    set $size = 0
+    set $free = 0
+    set $nodes = 0
+    set $node = $arg0->active
+    set $done = 0
+    while $done == 0
+        set $size = $size + (4096 << $node->index)
+        set $free = $free + ($node->endp - $node->first_avail)
+        set $nodes = $nodes + 1
+        set $node = $node->next
+        if $node == $arg0->active
+            set $done = 1
+        end
+    end
+    printf "Pool '%s' [%p]: %d/%d free (%d blocks)\n", $p->tag, $p, $free, $size, $nodes
+end
+
 # Set sane defaults for common signals:
 handle SIGPIPE noprint pass nostop
 handle SIGUSR1 print pass nostop