Index: plugins/rt_topo/crbs_route.c =================================================================== --- plugins/rt_topo/crbs_route.c (revision 1405) +++ plugins/rt_topo/crbs_route.c (revision 1406) @@ -187,7 +187,7 @@ char tmp[128]; hop_cnt++; - printf(" {%d} ", hop_cnt); + if (crbs_trace_ast) printf(" {%d} ", hop_cnt); if (hop_svg) { sprintf(tmp, "3_GRBS_routed_%d_h%d_a.svg", cnt_grbs, hop_cnt); @@ -298,14 +298,14 @@ /*printf("Neigh: %d / %d (dir: %d)\n", a->pt_idx, a->pts.used, a->grbs_idx);*/ if (pt == crbs->target->pt->user_data) { /* quick lane for reaching the target */ - printf(" try from %s P%ld to TARGET P%ld", from_type, curr->pt->uid, pt->gpt->uid); + if (crbs_trace_ast) printf(" try from %s P%ld to TARGET P%ld", from_type, curr->pt->uid, pt->gpt->uid); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_INC); if (next != NULL) { a->pt_idx = a->pts.used; /* don't consider detours from the current node if target node can be reached directly */ - printf(" -> ok\n"); + if (crbs_trace_ast) printf(" -> ok\n"); return crbs->target; } - printf(" -> failed\n"); + if (crbs_trace_ast) printf(" -> failed\n"); a->pt_idx++; continue; } @@ -312,7 +312,7 @@ while(a->grbs_idx < 4) { - printf(" try from %s P%ld to P%ld", from_type, curr->pt->uid, pt->gpt->uid); + if (crbs_trace_ast) printf(" try from %s P%ld to P%ld", from_type, curr->pt->uid, pt->gpt->uid); if (crbs->disable_concave) { if (a->grbs_idx < 2) @@ -322,18 +322,18 @@ /* prefer concave over convex; order matters when reaching target: first valid solution will stop the search */ switch(a->grbs_idx) { - case 0: printf(" concave ccw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONCAVE_CCW); break; - case 1: printf(" concave cw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONCAVE_CW); break; - case 2: printf(" convex ccw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONVEX_CCW); break; - case 3: printf(" convex cw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONVEX_CW); break; + case 0: if (crbs_trace_ast) printf(" concave ccw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONCAVE_CCW); break; + case 1: if (crbs_trace_ast) printf(" concave cw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONCAVE_CW); break; + case 2: if (crbs_trace_ast) printf(" convex ccw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONVEX_CCW); break; + case 3: if (crbs_trace_ast) printf(" convex cw"); next = crbs_next_hop(crbs, curr, pt, GRBS_ADIR_CONVEX_CW); break; } a->grbs_idx++; if (next != NULL) { - printf(" -> ok\n"); + if (crbs_trace_ast) printf(" -> ok\n"); return next; } - printf(" -> failed\n"); + if (crbs_trace_ast) printf(" -> failed\n"); } }