generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stack memory management

Browse Source 
From 747M to 6.2M for profiling tests.
This commit is contained in:
Jason Turner
2014-11-14 20:28:53 -07:00
parent db207b345b
commit 28124e4b33
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -497,11 +497,13 @@ namespace chaiscript
void new_scope() void new_scope()
{ {
get_stack_data().emplace_back(); get_stack_data().emplace_back();
m_stack_holder->call_params.emplace_back();
} }
/// Pops the current scope from the stack /// Pops the current scope from the stack
void pop_scope() void pop_scope()
{ {
m_stack_holder->call_params.pop_back();
StackData &stack = get_stack_data(); StackData &stack = get_stack_data();
if (stack.size() > 1) if (stack.size() > 1)
{ {
@@ -918,7 +920,7 @@ namespace chaiscript
void save_function_params(std::initializer_list<Boxed_Value> t_params) void save_function_params(std::initializer_list<Boxed_Value> t_params)
{ {
Stack_Holder &s = *m_stack_holder; Stack_Holder &s = *m_stack_holder;
s.call_params.insert(s.call_params.begin(), std::move(t_params)); s.call_params.back().insert(s.call_params.back().begin(), std::move(t_params));
} }
void save_function_params(std::vector<Boxed_Value> &&t_params) void save_function_params(std::vector<Boxed_Value> &&t_params)
@@ -927,14 +929,14 @@ namespace chaiscript
for (auto &&param : t_params) for (auto &&param : t_params)
{ {
s.call_params.insert(s.call_params.begin(), std::move(param)); s.call_params.back().insert(s.call_params.back().begin(), std::move(param));
} }
} }
void save_function_params(const std::vector<Boxed_Value> &t_params) void save_function_params(const std::vector<Boxed_Value> &t_params)
{ {
Stack_Holder &s = *m_stack_holder; Stack_Holder &s = *m_stack_holder;
s.call_params.insert(s.call_params.begin(), t_params.begin(), t_params.end()); s.call_params.back().insert(s.call_params.back().begin(), t_params.begin(), t_params.end());
} }
void new_function_call() void new_function_call()
@@ -945,7 +947,7 @@ namespace chaiscript
m_conversions.enable_conversion_saves(true); m_conversions.enable_conversion_saves(true);
} }
++m_stack_holder->call_depth; ++s.call_depth;
save_function_params(m_conversions.take_saves()); save_function_params(m_conversions.take_saves());
} }
@@ -959,9 +961,7 @@ namespace chaiscript
if (s.call_depth == 0) if (s.call_depth == 0)
{ {
/// \todo Critical: this needs to be smarter, memory can expand quickly s.call_params.back().clear();
/// in tight loops involving function calls
s.call_params.clear();
m_conversions.enable_conversion_saves(false); m_conversions.enable_conversion_saves(false);
} }
} }
@@ -1153,11 +1153,12 @@ namespace chaiscript
: call_depth(0) : call_depth(0)
{ {
stacks.emplace_back(1); stacks.emplace_back(1);
call_params.emplace_back();
} }
std::deque<StackData> stacks; std::deque<StackData> stacks;
std::list<Boxed_Value> call_params; std::deque<std::list<Boxed_Value>> call_params;
int call_depth; int call_depth;
}; };

3
include/chaiscript/language/chaiscript_eval.hpp
View File

@@ -382,6 +382,7 @@ namespace chaiscript
virtual ~Equation_AST_Node() {} virtual ~Equation_AST_Node() {}
virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss) const CHAISCRIPT_OVERRIDE { virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss) const CHAISCRIPT_OVERRIDE {
chaiscript::eval::detail::Function_Push_Pop fpp(t_ss);
Boxed_Value retval = this->children.back()->eval(t_ss); Boxed_Value retval = this->children.back()->eval(t_ss);
@@ -595,8 +596,8 @@ namespace chaiscript
AST_Node(t_ast_node_text, AST_Node_Type::Dot_Access, t_fname, t_start_line, t_start_col, t_end_line, t_end_col) { } AST_Node(t_ast_node_text, AST_Node_Type::Dot_Access, t_fname, t_start_line, t_start_col, t_end_line, t_end_col) { }
virtual ~Dot_Access_AST_Node() {} virtual ~Dot_Access_AST_Node() {}
virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss) const CHAISCRIPT_OVERRIDE{ virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss) const CHAISCRIPT_OVERRIDE{
Boxed_Value retval = this->children[0]->eval(t_ss);
chaiscript::eval::detail::Function_Push_Pop fpp(t_ss); chaiscript::eval::detail::Function_Push_Pop fpp(t_ss);
Boxed_Value retval = this->children[0]->eval(t_ss);
if (this->children.size() > 1) { if (this->children.size() > 1) {
for (size_t i = 2; i < this->children.size(); i+=2) { for (size_t i = 2; i < this->children.size(); i+=2) {