derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trace: reimplement the DTRACE function so it doesn't use a vector

Browse Source 
At the same time, rename the trace flags to debug flags since they
have broader usage than simply tracing.  This means that
--trace-flags is now --debug-flags and --trace-help is now --debug-help
This commit is contained in:
Nathan Binkert
2011-04-15 10:44:32 -07:00
parent f946d7bcdb
commit eddac53ff6
221 changed files with 740 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/python/swig/debug.i
View File

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2006 The Regents of The University of Michigan
* Copyright (c) 2010 The Hewlett-Packard Development Company
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,11 +32,62 @@
%module(package="m5.internal") debug
%{
#include <cassert>
#include <map>
#include <string>
#include <vector>
#include "base/debug.hh"
#include "base/types.hh"
#include "sim/debug.hh"
using namespace std;
typedef map<string, Debug::Flag *> FlagsMap;
typedef vector<Debug::Flag *> FlagsVec;
namespace Debug {
extern int allFlagsVersion;
FlagsMap &allFlags();
}
inline int
getAllFlagsVersion()
{
return Debug::allFlagsVersion;
}
inline FlagsVec
getAllFlags()
{
FlagsMap &flagsMap = Debug::allFlags();
FlagsVec flags(flagsMap.size());
int index = 0;
FlagsMap::iterator i = flagsMap.begin();
FlagsMap::iterator end = flagsMap.end();
for (; i != end; ++i) {
assert(index < flags.size());
flags[index++] = i->second;
}
return flags;
}
%}
%ignore Debug::SimpleFlag::operator!;
%include <std_string.i>
%include <std_vector.i>
%include <stdint.i>
%include "base/debug.hh"
%include "base/types.hh"
%include "sim/debug.hh"
%template(AllFlags) std::vector<Debug::Flag *>;
int getAllFlagsVersion();
std::vector<Debug::Flag *> getAllFlags();

16
src/python/swig/trace.i
View File

@@ -40,18 +40,6 @@ output(const char *filename)
Trace::setOutput(filename);
}
inline void
set(const char *flag)
{
Trace::changeFlag(flag, true);
}
inline void
clear(const char *flag)
{
Trace::changeFlag(flag, false);
}
inline void
ignore(const char *expr)
{
@@ -61,10 +49,6 @@ ignore(const char *expr)
using Trace::enabled;
%}
%inline %{
extern void output(const char *string);
extern void set(const char *string);
extern void clear(const char *string);
extern void ignore(const char *expr);
extern bool enabled;
%}