From 184decd1963a7f016231f7614b5e739ad514ed37 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 10 Feb 2007 15:14:50 -0800 Subject: Clean up tracing stuff more, get rid of the trace log since its not all that useful. Fix a few bugs with python/C++ integration. --HG-- extra : convert_revision : a706512f7dc8b0c88f1ff96fe35ab8fbf9548b78 --- src/kern/tru64/dump_mbuf.cc | 9 +++--- src/kern/tru64/printf.cc | 62 ++++++++++++++++++++++-------------------- src/kern/tru64/tru64_events.cc | 9 ++++-- 3 files changed, 42 insertions(+), 38 deletions(-) (limited to 'src/kern/tru64') diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc index 22d2228f0..5ccfbca5d 100644 --- a/src/kern/tru64/dump_mbuf.cc +++ b/src/kern/tru64/dump_mbuf.cc @@ -50,6 +50,7 @@ void DumpMbuf(Arguments args) { ThreadContext *tc = args.getThreadContext(); + StringWrap name(tc->getSystemPtr()->name()); Addr addr = (Addr)args; struct mbuf m; @@ -57,16 +58,14 @@ DumpMbuf(Arguments args) int count = m.m_pkthdr.len; - ccprintf(DebugOut(), "m=%#lx, m->m_pkthdr.len=%#d\n", addr, - m.m_pkthdr.len); + DPRINTFN("m=%#lx, m->m_pkthdr.len=%#d\n", addr, m.m_pkthdr.len); while (count > 0) { - ccprintf(DebugOut(), "m=%#lx, m->m_data=%#lx, m->m_len=%d\n", + DPRINTFN("m=%#lx, m->m_data=%#lx, m->m_len=%d\n", addr, m.m_data, m.m_len); char *buffer = new char[m.m_len]; CopyOut(tc, buffer, m.m_data, m.m_len); - Trace::dataDump(curTick, tc->getSystemPtr()->name(), (uint8_t *)buffer, - m.m_len); + DDUMPN((uint8_t *)buffer, m.m_len); delete [] buffer; count -= m.m_len; diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc index 2c767c4d2..4245ac6d0 100644 --- a/src/kern/tru64/printf.cc +++ b/src/kern/tru64/printf.cc @@ -44,11 +44,13 @@ namespace tru64 { void Printf(TheISA::Arguments args) { + std::ostream &out = Trace::output(); + char *p = (char *)args++; - ios::fmtflags saved_flags = DebugOut().flags(); - char old_fill = DebugOut().fill(); - int old_precision = DebugOut().precision(); + ios::fmtflags saved_flags = out.flags(); + char old_fill = out.fill(); + int old_precision = out.precision(); while (*p) { switch (*p) { @@ -121,53 +123,53 @@ Printf(TheISA::Arguments args) case 'P': case 'p': { if (hexnum) - DebugOut() << hex; + out << hex; if (octal) - DebugOut() << oct; + out << oct; if (format) { if (!zero) - DebugOut().setf(ios::showbase); + out.setf(ios::showbase); else { if (hexnum) { - DebugOut() << "0x"; + out << "0x"; width -= 2; } else if (octal) { - DebugOut() << "0"; + out << "0"; width -= 1; } } } if (zero) - DebugOut().fill('0'); + out.fill('0'); if (width > 0) - DebugOut().width(width); + out.width(width); if (leftjustify && !zero) - DebugOut().setf(ios::left); + out.setf(ios::left); if (sign) { if (islong) - DebugOut() << (int64_t)args; + out << (int64_t)args; else - DebugOut() << (int32_t)args; + out << (int32_t)args; } else { if (islong) - DebugOut() << (uint64_t)args; + out << (uint64_t)args; else - DebugOut() << (uint32_t)args; + out << (uint32_t)args; } if (zero) - DebugOut().fill(' '); + out.fill(' '); if (width > 0) - DebugOut().width(0); + out.width(0); - DebugOut() << dec; + out << dec; ++args; } @@ -179,11 +181,11 @@ Printf(TheISA::Arguments args) s = ""; if (width > 0) - DebugOut().width(width); + out.width(width); if (leftjustify) - DebugOut().setf(ios::left); + out.setf(ios::left); - DebugOut() << s; + out << s; ++args; } break; @@ -204,7 +206,7 @@ Printf(TheISA::Arguments args) while (width-- > 0) { char c = (char)(num & mask); if (c) - DebugOut() << c; + out << c; num >>= 8; } @@ -214,7 +216,7 @@ Printf(TheISA::Arguments args) case 'b': { uint64_t n = (uint64_t)args++; char *s = (char *)args++; - DebugOut() << s << ": " << n; + out << s << ": " << n; } break; case 'n': @@ -236,33 +238,33 @@ Printf(TheISA::Arguments args) } break; case '%': - DebugOut() << '%'; + out << '%'; break; } ++p; } break; case '\n': - DebugOut() << endl; + out << endl; ++p; break; case '\r': ++p; if (*p != '\n') - DebugOut() << endl; + out << endl; break; default: { size_t len = strcspn(p, "%\n\r\0"); - DebugOut().write(p, len); + out.write(p, len); p += len; } } } - DebugOut().flags(saved_flags); - DebugOut().fill(old_fill); - DebugOut().precision(old_precision); + out.flags(saved_flags); + out.fill(old_fill); + out.precision(old_precision); } } // namespace Tru64 diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc index 851b3a526..0ad89f8bd 100644 --- a/src/kern/tru64/tru64_events.cc +++ b/src/kern/tru64/tru64_events.cc @@ -79,7 +79,8 @@ void PrintfEvent::process(ThreadContext *tc) { if (DTRACE(Printf)) { - DebugOut() << curTick << ": " << tc->getCpuPtr()->name() << ": "; + StringWrap name(tc->getSystemPtr()->name()); + DPRINTFN(""); Arguments args(tc); tru64::Printf(args); @@ -90,8 +91,10 @@ void DebugPrintfEvent::process(ThreadContext *tc) { if (DTRACE(DebugPrintf)) { - if (!raw) - DebugOut() << curTick << ": " << tc->getCpuPtr()->name() << ": "; + if (!raw) { + StringWrap name(tc->getSystemPtr()->name()); + DPRINTFN(""); + } Arguments args(tc); tru64::Printf(args); -- cgit v1.2.3