summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/python/m5/main.py20
-rw-r--r--src/python/swig/trace.i15
2 files changed, 4 insertions, 31 deletions
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 3bc046304..0bd5b431a 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -137,16 +137,10 @@ add_option("--debug-break", metavar="TIME[,TIME]", action='append', split=',',
set_group("Trace Options")
add_option("--trace-flags", metavar="FLAG[,FLAG]", action='append', split=',',
help="Sets the flags for tracing")
-add_option("--trace-start", metavar="TIME", default='0s',
- help="Start tracing at TIME (must have units)")
+add_option("--trace-start", metavar="TIME", type='int',
+ help="Start tracing at TIME (must be in ticks)")
add_option("--trace-file", metavar="FILE", default="cout",
help="Sets the output file for tracing [Default: %default]")
-add_option("--trace-circlebuf", metavar="SIZE", type="int", default=0,
- help="If SIZE is non-zero, turn on the circular buffer with SIZE lines")
-add_option("--no-trace-circlebuf", action="store_const", const=0,
- dest='trace_circlebuf', help=optparse.SUPPRESS_HELP)
-bool_option("trace-dumponexit", default=False,
- help="Dump trace buffer on exit")
add_option("--trace-ignore", metavar="EXPR", action='append', split=':',
help="Ignore EXPR sim objects")
@@ -282,14 +276,8 @@ def main():
internal.event.enabled = True
internal.event.create(enable_trace, options.trace_start)
- if options.trace_file is not None:
- internal.trace.file(options.trace_file)
-
- if options.trace_bufsize is not None:
- internal.trace.buffer_size(options.bufsize)
-
- #if options.trace_dumponexit:
- # internal.trace.dumpOnExit = True
+ #if options.trace_file is not None:
+ # internal.trace.file(options.trace_file)
for ignore in options.trace_ignore:
internal.trace.ignore(ignore)
diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 65f300b2b..5d1669d02 100644
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -53,19 +53,6 @@ ignore(const char *expr)
Trace::ignore.setExpression(expr);
}
-inline void
-buffer_size(int num_lines)
-{
- if ((int)num_lines > 0)
- Trace::theLog.init(num_lines);
-}
-
-inline void
-dump(const char *filename)
-{
- dumpTrace(filename);
-}
-
using Trace::enabled;
%}
@@ -73,8 +60,6 @@ using Trace::enabled;
extern void ignore(const char *expr);
extern void set(const char *string);
extern void clear(const char *string);
-extern void buffer_size(int num_lines);
-extern void dump(const char *filename);
extern bool enabled;
%}