mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: improve the DOT dump of the ebtree

Browse Source 
Use a smaller and cleaner fixed font, use upper case to indicate sides on
branches, remove the useless node/leaf markers on branches since the colors
already indicate them, and show the node's key as it helps spot the matching
leaf.
This commit is contained in:
Willy Tarreau 2017-11-15 17:49:54 +01:00
parent ed3cda02ae
commit 6c7f4deb21
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/standard.c
View File

@ -2236,49 +2236,46 @@ void eb32sc_to_file(FILE *file, struct eb_root *root)
fprintf(file, fprintf(file,
"digraph ebtree {\n" "digraph ebtree {\n"
" node [fontname=\"courier-bold\" shape=\"box\" style=\"filled\" color=\"black\" fillcolor=\"white\"];\n" " node [fontname=\"fixed\" fontsize=8 shape=\"box\" style=\"filled\" color=\"black\" fillcolor=\"white\"];\n"
" edge [fontname=\"arial\" style=\"solid\" color=\"magenta\" dir=\"forward\"];\n" " edge [fontname=\"fixed\" fontsize=8 style=\"solid\" color=\"magenta\" dir=\"forward\"];\n"
" \"%lx_n\" [label=\"root\\n%lx\"]\n", (long)eb_root_to_node(root), (long)root " \"%lx_n\" [label=\"root\\n%lx\"]\n", (long)eb_root_to_node(root), (long)root
); );
fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"l:%c\"];\n", fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"L\"];\n",
(long)eb_root_to_node(root), (long)eb_root_to_node(root),
(long)eb_root_to_node(eb_clrtag(root->b[0])), (long)eb_root_to_node(eb_clrtag(root->b[0])),
eb_gettag(root->b[0]) == EB_LEAF ? 'l' : 'n',
eb_gettag(root->b[0]) == EB_LEAF ? 'l' : 'n'); eb_gettag(root->b[0]) == EB_LEAF ? 'l' : 'n');
node = eb32sc_first(root, scope); node = eb32sc_first(root, scope);
while (node) { while (node) {
if (node->node.node_p) { if (node->node.node_p) {
/* node part is used */ /* node part is used */
fprintf(file, " \"%lx_n\" [label=\"%lx\\nbit=%d\\nscope=%lx\" fillcolor=\"lightskyblue1\"];\n", fprintf(file, " \"%lx_n\" [label=\"%lx\\nkey=%u\\nscope=%lx\\nbit=%d\" fillcolor=\"lightskyblue1\"];\n",
(long)node, (long)node, node->node.bit, node->node_s); (long)node, (long)node, node->key, node->node_s, node->node.bit);
fprintf(file, " \"%lx_n\" -> \"%lx_n\" [taillabel=\"np:%c\"];\n", fprintf(file, " \"%lx_n\" -> \"%lx_n\" [taillabel=\"%c\"];\n",
(long)node, (long)node,
(long)eb_root_to_node(eb_clrtag(node->node.node_p)), (long)eb_root_to_node(eb_clrtag(node->node.node_p)),
eb_gettag(node->node.node_p) ? 'r' : 'l'); eb_gettag(node->node.node_p) ? 'R' : 'L');
fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"l:%c\"];\n", fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"L\"];\n",
(long)node, (long)node,
(long)eb_root_to_node(eb_clrtag(node->node.branches.b[0])), (long)eb_root_to_node(eb_clrtag(node->node.branches.b[0])),
eb_gettag(node->node.branches.b[0]) == EB_LEAF ? 'l' : 'n',
eb_gettag(node->node.branches.b[0]) == EB_LEAF ? 'l' : 'n'); eb_gettag(node->node.branches.b[0]) == EB_LEAF ? 'l' : 'n');
fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"r:%c\"];\n", fprintf(file, " \"%lx_n\" -> \"%lx_%c\" [taillabel=\"R\"];\n",
(long)node, (long)node,
(long)eb_root_to_node(eb_clrtag(node->node.branches.b[1])), (long)eb_root_to_node(eb_clrtag(node->node.branches.b[1])),
eb_gettag(node->node.branches.b[1]) == EB_LEAF ? 'l' : 'n',
eb_gettag(node->node.branches.b[1]) == EB_LEAF ? 'l' : 'n'); eb_gettag(node->node.branches.b[1]) == EB_LEAF ? 'l' : 'n');
} }
fprintf(file, " \"%lx_l\" [label=\"%lx\\nkey=%u\\nscope=%lx\\npfx=%u\" fillcolor=\"yellow\"];\n", fprintf(file, " \"%lx_l\" [label=\"%lx\\nkey=%u\\nscope=%lx\\npfx=%u\" fillcolor=\"yellow\"];\n",
(long)node, (long)node, node->key, node->leaf_s, node->node.pfx); (long)node, (long)node, node->key, node->leaf_s, node->node.pfx);
fprintf(file, " \"%lx_l\" -> \"%lx_n\" [taillabel=\"lp:%c\"];\n", fprintf(file, " \"%lx_l\" -> \"%lx_n\" [taillabel=\"%c\"];\n",
(long)node, (long)node,
(long)eb_root_to_node(eb_clrtag(node->node.leaf_p)), (long)eb_root_to_node(eb_clrtag(node->node.leaf_p)),
eb_gettag(node->node.leaf_p) ? 'r' : 'l'); eb_gettag(node->node.leaf_p) ? 'R' : 'L');
node = eb32sc_next(node, scope); node = eb32sc_next(node, scope);
} }
fprintf(file, "}\n"); fprintf(file, "}\n");