michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(library/trace): allow user to disable subclasses of a trace class

Browse source 
Example:

set_option trace.blast true         -- enables trace.blast class and all subclasses
set_option trace.blast.action false -- disables the given subclass

Result: all blast classes are traced but blast.action
This commit is contained in:
Leonardo de Moura 2015-12-11 11:03:16 -08:00
parent 7f1800962a
commit b7de10a6d2
3 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/library/trace.cpp
View file

@ -14,6 +14,7 @@ namespace lean {
static name_set * g_trace_classes = nullptr; static name_set * g_trace_classes = nullptr;
static name_map<name_set> * g_trace_aliases = nullptr; static name_map<name_set> * g_trace_aliases = nullptr;
MK_THREAD_LOCAL_GET_DEF(std::vector<name>, get_enabled_trace_classes); MK_THREAD_LOCAL_GET_DEF(std::vector<name>, get_enabled_trace_classes);
MK_THREAD_LOCAL_GET_DEF(std::vector<name>, get_disabled_trace_classes);
MK_THREAD_LOCAL_GET_DEF(environment, get_dummy_env); MK_THREAD_LOCAL_GET_DEF(environment, get_dummy_env);
LEAN_THREAD_PTR(environment, g_env); LEAN_THREAD_PTR(environment, g_env);
LEAN_THREAD_PTR(io_state, g_ios); LEAN_THREAD_PTR(io_state, g_ios);
@ -37,15 +38,23 @@ bool is_trace_enabled() {
return !get_enabled_trace_classes().empty(); return !get_enabled_trace_classes().empty();
} }
void enable_trace_class(name const & c) { static void update_class(std::vector<name> & cs, name const & c) {
std::vector<name> & cs = get_enabled_trace_classes();
if (std::find(cs.begin(), cs.end(), c) == cs.end()) { if (std::find(cs.begin(), cs.end(), c) == cs.end()) {
cs.push_back(c); cs.push_back(c);
} }
} }
bool is_trace_class_enabled_core(name const & n) {
for (name const & p : get_enabled_trace_classes()) { static void enable_trace_class(name const & c) {
update_class(get_enabled_trace_classes(), c);
}
static void disable_trace_class(name const & c) {
update_class(get_disabled_trace_classes(), c);
}
static bool is_trace_class_set_core(std::vector<name> const & cs, name const & n) {
for (name const & p : cs) {
if (is_prefix_of(p, n)) { if (is_prefix_of(p, n)) {
return true; return true;
} }
@ -53,17 +62,15 @@ bool is_trace_class_enabled_core(name const & n) {
return false; return false;
} }
bool is_trace_class_enabled(name const & n) { static bool is_trace_class_set(std::vector<name> const & cs, name const & n) {
if (!is_trace_enabled()) if (is_trace_class_set_core(cs, n))
return false;
if (is_trace_class_enabled_core(n))
return true; return true;
auto it = n; auto it = n;
while (true) { while (true) {
if (auto s = g_trace_aliases->find(it)) { if (auto s = g_trace_aliases->find(it)) {
bool found = false; bool found = false;
s->for_each([&](name const & alias) { s->for_each([&](name const & alias) {
if (!found && is_trace_class_enabled_core(alias)) if (!found && is_trace_class_set_core(cs, alias))
found = true; found = true;
}); });
if (found) if (found)
@ -75,17 +82,30 @@ bool is_trace_class_enabled(name const & n) {
} }
} }
bool is_trace_class_enabled(name const & n) {
if (!is_trace_enabled())
return false;
if (is_trace_class_set(get_disabled_trace_classes(), n))
return false; // it was explicitly disabled
return is_trace_class_set(get_enabled_trace_classes(), n);
}
scope_trace_env::scope_trace_env(environment const & env, io_state const & ios) { scope_trace_env::scope_trace_env(environment const & env, io_state const & ios) {
m_sz = get_enabled_trace_classes().size(); m_enable_sz = get_enabled_trace_classes().size();
m_old_env = g_env; m_disable_sz = get_disabled_trace_classes().size();
m_old_ios = g_ios; m_old_env = g_env;
g_env = const_cast<environment*>(&env); m_old_ios = g_ios;
g_ios = const_cast<io_state*>(&ios); g_env = const_cast<environment*>(&env);
g_ios = const_cast<io_state*>(&ios);
options const & opts = ios.get_options();
name trace("trace"); name trace("trace");
ios.get_options().for_each([&](name const & n) { opts.for_each([&](name const & n) {
if (is_prefix_of(trace, n)) { if (is_prefix_of(trace, n)) {
name cls = n.replace_prefix(trace, name()); name cls = n.replace_prefix(trace, name());
enable_trace_class(cls); if (opts.get_bool(n, false))
enable_trace_class(cls);
else
disable_trace_class(cls);
} }
}); });
} }
@ -93,7 +113,8 @@ scope_trace_env::scope_trace_env(environment const & env, io_state const & ios)
scope_trace_env::~scope_trace_env() { scope_trace_env::~scope_trace_env() {
g_env = const_cast<environment*>(m_old_env); g_env = const_cast<environment*>(m_old_env);
g_ios = const_cast<io_state*>(m_old_ios); g_ios = const_cast<io_state*>(m_old_ios);
get_enabled_trace_classes().resize(m_sz); get_enabled_trace_classes().resize(m_enable_sz);
get_disabled_trace_classes().resize(m_disable_sz);
} }
void scope_trace_inc_depth::activate() { void scope_trace_inc_depth::activate() {

3
src/library/trace.h
View file

@ -17,7 +17,8 @@ bool is_trace_class_enabled(name const & n);
#define lean_is_trace_enabled(CName) (::lean::is_trace_enabled() && ::lean::is_trace_class_enabled(CName)) #define lean_is_trace_enabled(CName) (::lean::is_trace_enabled() && ::lean::is_trace_class_enabled(CName))
class scope_trace_env { class scope_trace_env {
unsigned m_sz; unsigned m_enable_sz;
unsigned m_disable_sz;
environment const * m_old_env; environment const * m_old_env;
io_state const * m_old_ios; io_state const * m_old_ios;
public: public:

5
tests/lean/run/blast_trace.lean Normal file
View file

@ -0,0 +1,5 @@
set_option trace.blast true
set_option trace.blast.action false
example (a b : Prop) : a ∧ b → b ∧ a :=
by blast