41d40
< #include "base/varargs.hh"
73,75c72,74
< void
< dprintf(Tick when, const std::string &name, const char *format,
< CPRINTF_DEFINITION)
---
>
> bool
> __dprintf_prologue(Tick when, const std::string &name)
78c77
< return;
---
> return false;
82,83c81,82
< string fmt = "";
< CPrintfArgsList args(VARARGS_ALLARGS);
---
> if (when != MaxTick)
> ccprintf(os, "%7d: ", when);
85,88c84,85
< if (!name.empty()) {
< fmt = "%s: " + fmt;
< args.push_front(name);
< }
---
> if (!name.empty())
> os << name << ": ";
90,98c87
< if (when != (Tick)-1) {
< fmt = "%7d: " + fmt;
< args.push_front(when);
< }
<
< fmt += format;
<
< ccprintf(os, fmt.c_str(), args);
< os.flush();
---
> return true;
104,121d92
< if (!name.empty() && ignore.match(name))
< return;
<
< std::ostream &os = *dprintf_stream;
<
< string fmt = "";
< CPrintfArgsList args;
<
< if (!name.empty()) {
< fmt = "%s: " + fmt;
< args.push_front(name);
< }
<
< if (when != (Tick)-1) {
< fmt = "%7d: " + fmt;
< args.push_front(when);
< }
<
122a94
> std::ostream &os = *dprintf_stream;
123a96
>
125c98,100
< ccprintf(os, fmt, args);
---
> if (!__dprintf_prologue(when, name))
> return;
>