trace.cc (8640:cb8a72779f7e) trace.cc (10292:933dfb9d8279)
1/*
2 * Copyright (c) 2001-2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 24 unchanged lines hidden (view full) ---

33#include <fstream>
34#include <iostream>
35#include <string>
36
37#include "base/misc.hh"
38#include "base/output.hh"
39#include "base/str.hh"
40#include "base/trace.hh"
1/*
2 * Copyright (c) 2001-2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 24 unchanged lines hidden (view full) ---

33#include <fstream>
34#include <iostream>
35#include <string>
36
37#include "base/misc.hh"
38#include "base/output.hh"
39#include "base/str.hh"
40#include "base/trace.hh"
41#include "base/varargs.hh"
42
43using namespace std;
44
45namespace Trace {
46
47const string DefaultName("global");
48bool enabled = false;
49

--- 15 unchanged lines hidden (view full) ---

65{
66 dprintf_stream = simout.find(filename);
67 if (!dprintf_stream)
68 dprintf_stream = simout.create(filename);
69}
70
71ObjectMatch ignore;
72
41
42using namespace std;
43
44namespace Trace {
45
46const string DefaultName("global");
47bool enabled = false;
48

--- 15 unchanged lines hidden (view full) ---

64{
65 dprintf_stream = simout.find(filename);
66 if (!dprintf_stream)
67 dprintf_stream = simout.create(filename);
68}
69
70ObjectMatch ignore;
71
73void
74dprintf(Tick when, const std::string &name, const char *format,
75 CPRINTF_DEFINITION)
72
73bool
74__dprintf_prologue(Tick when, const std::string &name)
76{
77 if (!name.empty() && ignore.match(name))
75{
76 if (!name.empty() && ignore.match(name))
78 return;
77 return false;
79
80 std::ostream &os = *dprintf_stream;
81
78
79 std::ostream &os = *dprintf_stream;
80
82 string fmt = "";
83 CPrintfArgsList args(VARARGS_ALLARGS);
81 if (when != MaxTick)
82 ccprintf(os, "%7d: ", when);
84
83
85 if (!name.empty()) {
86 fmt = "%s: " + fmt;
87 args.push_front(name);
88 }
84 if (!name.empty())
85 os << name << ": ";
89
86
90 if (when != (Tick)-1) {
91 fmt = "%7d: " + fmt;
92 args.push_front(when);
93 }
94
95 fmt += format;
96
97 ccprintf(os, fmt.c_str(), args);
98 os.flush();
87 return true;
99}
100
101void
102dump(Tick when, const std::string &name, const void *d, int len)
103{
88}
89
90void
91dump(Tick when, const std::string &name, const void *d, int len)
92{
104 if (!name.empty() && ignore.match(name))
105 return;
106
107 std::ostream &os = *dprintf_stream;
108
109 string fmt = "";
110 CPrintfArgsList args;
111
112 if (!name.empty()) {
113 fmt = "%s: " + fmt;
114 args.push_front(name);
115 }
116
117 if (when != (Tick)-1) {
118 fmt = "%7d: " + fmt;
119 args.push_front(when);
120 }
121
122 const char *data = static_cast<const char *>(d);
93 const char *data = static_cast<const char *>(d);
94 std::ostream &os = *dprintf_stream;
123 int c, i, j;
95 int c, i, j;
96
124 for (i = 0; i < len; i += 16) {
97 for (i = 0; i < len; i += 16) {
125 ccprintf(os, fmt, args);
98 if (!__dprintf_prologue(when, name))
99 return;
100
126 ccprintf(os, "%08x ", i);
127 c = len - i;
128 if (c > 16) c = 16;
129
130 for (j = 0; j < c; j++) {
131 ccprintf(os, "%02x ", data[i + j] & 0xff);
132 if ((j & 0xf) == 7 && j > 0)
133 ccprintf(os, " ");

--- 19 unchanged lines hidden --- 		101 ccprintf(os, "%08x ", i);
102 c = len - i;
103 if (c > 16) c = 16;
104
105 for (j = 0; j < c; j++) {
106 ccprintf(os, "%02x ", data[i + j] & 0xff);
107 if ((j & 0xf) == 7 && j > 0)
108 ccprintf(os, " ");

--- 19 unchanged lines hidden ---