From: Julian Seward Date: Wed, 15 Jul 2009 14:51:48 +0000 (+0000) Subject: Merge lackey/ changes from branches/MESSAGING_TIDYUP r10464. X-Git-Tag: svn/VALGRIND_3_5_0~374 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f265f54e66bc6fbf977bff11ad62a7f890e32de;p=thirdparty%2Fvalgrind.git Merge lackey/ changes from branches/MESSAGING_TIDYUP r10464. See trunk r10465 commit message for details. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10474 --- diff --git a/lackey/lk_main.c b/lackey/lk_main.c index 1a52c66114..65e8885dd2 100644 --- a/lackey/lk_main.c +++ b/lackey/lk_main.c @@ -368,14 +368,14 @@ static void instrument_detail(IRSB* sb, Op op, IRType type) static void print_details ( void ) { Int typeIx; - VG_UMSG(" Type Loads Stores AluOps"); - VG_UMSG(" -------------------------------------------"); + VG_(umsg)(" Type Loads Stores AluOps\n"); + VG_(umsg)(" -------------------------------------------\n"); for (typeIx = 0; typeIx < N_TYPES; typeIx++) { - VG_UMSG(" %4s %'12llu %'12llu %'12llu", - nameOfTypeIndex( typeIx ), - detailCounts[OpLoad ][typeIx], - detailCounts[OpStore][typeIx], - detailCounts[OpAlu ][typeIx] + VG_(umsg)(" %4s %'12llu %'12llu %'12llu\n", + nameOfTypeIndex( typeIx ), + detailCounts[OpLoad ][typeIx], + detailCounts[OpStore][typeIx], + detailCounts[OpAlu ][typeIx] ); } } @@ -883,44 +883,44 @@ static void lk_fini(Int exitcode) ULong total_Jccs = n_Jccs + n_IJccs; ULong taken_Jccs = (n_Jccs - n_Jccs_untaken) + n_IJccs_untaken; - VG_UMSG("Counted %'llu calls to %s()", n_func_calls, clo_fnname); + VG_(umsg)("Counted %'llu calls to %s()\n", n_func_calls, clo_fnname); - VG_UMSG(""); - VG_UMSG("Jccs:"); - VG_UMSG(" total: %'llu", total_Jccs); + VG_(umsg)("\n"); + VG_(umsg)("Jccs:\n"); + VG_(umsg)(" total: %'llu\n", total_Jccs); VG_(percentify)(taken_Jccs, (total_Jccs ? total_Jccs : 1), percentify_decs, percentify_size, percentify_buf); - VG_UMSG(" taken: %'llu (%s)", + VG_(umsg)(" taken: %'llu (%s)\n", taken_Jccs, percentify_buf); - VG_UMSG(""); - VG_UMSG("Executed:"); - VG_UMSG(" SBs entered: %'llu", n_SBs_entered); - VG_UMSG(" SBs completed: %'llu", n_SBs_completed); - VG_UMSG(" guest instrs: %'llu", n_guest_instrs); - VG_UMSG(" IRStmts: %'llu", n_IRStmts); + VG_(umsg)("\n"); + VG_(umsg)("Executed:\n"); + VG_(umsg)(" SBs entered: %'llu\n", n_SBs_entered); + VG_(umsg)(" SBs completed: %'llu\n", n_SBs_completed); + VG_(umsg)(" guest instrs: %'llu\n", n_guest_instrs); + VG_(umsg)(" IRStmts: %'llu\n", n_IRStmts); - VG_UMSG(""); - VG_UMSG("Ratios:"); + VG_(umsg)("\n"); + VG_(umsg)("Ratios:\n"); tl_assert(n_SBs_entered); // Paranoia time. - VG_UMSG(" guest instrs : SB entered = %'llu : 10", + VG_(umsg)(" guest instrs : SB entered = %'llu : 10\n", 10 * n_guest_instrs / n_SBs_entered); - VG_UMSG(" IRStmts : SB entered = %'llu : 10", + VG_(umsg)(" IRStmts : SB entered = %'llu : 10\n", 10 * n_IRStmts / n_SBs_entered); tl_assert(n_guest_instrs); // Paranoia time. - VG_UMSG(" IRStmts : guest instr = %'llu : 10", + VG_(umsg)(" IRStmts : guest instr = %'llu : 10\n", 10 * n_IRStmts / n_guest_instrs); } if (clo_detailed_counts) { - VG_UMSG(""); - VG_UMSG("IR-level counts by type:"); + VG_(umsg)("\n"); + VG_(umsg)("IR-level counts by type:\n"); print_details(); } if (clo_basic_counts) { - VG_UMSG(""); - VG_UMSG("Exit code: %d", exitcode); + VG_(umsg)("\n"); + VG_(umsg)("Exit code: %d\n", exitcode); } }