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

Make local location saving atomic

Browse Source
This commit is contained in:
Jason Turner 2015-06-20 10:52:05 -06:00
parent c7689f18ec
commit ec33cf2709
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,7 +569,7 @@ namespace chaiscript
/// Searches the current stack for an object of the given name /// Searches the current stack for an object of the given name
/// includes a special overload for the _ place holder object to /// includes a special overload for the _ place holder object to
/// ensure that it is always in scope. /// ensure that it is always in scope.
Boxed_Value get_object(const std::string &name, uint32_t &t_loc) const Boxed_Value get_object(const std::string &name, std::atomic_uint_fast32_t &t_loc) const
{ {
enum class Loc : uint32_t { enum class Loc : uint32_t {
located = 0x80000000, located = 0x80000000,
@ -578,7 +578,7 @@ namespace chaiscript
loc_mask = 0x0000FFFF loc_mask = 0x0000FFFF
}; };
unsigned int loc = t_loc; uint32_t loc = t_loc.load(std::memory_order_relaxed);
if (loc == 0) if (loc == 0)
{ {
@ -590,16 +590,17 @@ namespace chaiscript
for (auto s = stack_elem->begin(); s != stack_elem->end(); ++s ) for (auto s = stack_elem->begin(); s != stack_elem->end(); ++s )
{ {
if (s->first == name) { if (s->first == name) {
t_loc = static_cast<uint32_t>(std::distance(stack.rbegin(), stack_elem) << 16) t_loc.store( static_cast<uint32_t>(std::distance(stack.rbegin(), stack_elem) << 16)
| static_cast<uint32_t>(std::distance(stack_elem->begin(), s)) | static_cast<uint32_t>(std::distance(stack_elem->begin(), s))
| static_cast<uint32_t>(Loc::located) | static_cast<uint32_t>(Loc::located)
| static_cast<uint32_t>(Loc::is_local); | static_cast<uint32_t>(Loc::is_local),
std::memory_order_relaxed);
return s->second; return s->second;
} }
} }
} }
t_loc = static_cast<uint32_t>(Loc::located); t_loc.store( static_cast<uint32_t>(Loc::located), std::memory_order_relaxed);
} else if (loc & static_cast<uint32_t>(Loc::is_local)) { } else if (loc & static_cast<uint32_t>(Loc::is_local)) {
auto &stack = get_stack_data(); auto &stack = get_stack_data();

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

@ -185,7 +185,7 @@ namespace chaiscript
Boxed_Value m_value; Boxed_Value m_value;
mutable uint32_t m_loc; mutable std::atomic_uint_fast32_t m_loc;
}; };
struct Char_AST_Node : public AST_Node { struct Char_AST_Node : public AST_Node {