140,141c140,141
< 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)")
144,149d143
< 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")
285,286c279,280
< if options.trace_file is not None:
< internal.trace.file(options.trace_file)
---
> #if options.trace_file is not None:
> # internal.trace.file(options.trace_file)
288,293d281
< if options.trace_bufsize is not None:
< internal.trace.buffer_size(options.bufsize)
<
< #if options.trace_dumponexit:
< # internal.trace.dumpOnExit = True
<