stepus53/psil
1
0
Fork 0
mirror of https://github.com/usatiuk/psil.git synced 2025-10-28 18:57:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

indexes are back!

Browse Source
This commit is contained in:
Stepan Usatiuk
2023-12-26 23:23:11 +01:00
parent a86012108e
commit 6829aabfa6
3 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/vm/includes/MemoryContext.h
View File

@@ -29,39 +29,49 @@ public:
return alloc_cell<CT>(std::forward<Args>(args)...);
}
// template<>
// Handle create_cell<NumAtomCell>(CellValType val) {
// {
// std::lock_guard l(_cells_lock);
// if (_numatom_index.contains(val)) {
// _numatom_index.at(val)->live = true;
// return _numatom_index.at(val);
// }
// }
// Handle newc = alloc_cell<NumAtomCell>(val);
// {
// std::lock_guard l(_cells_lock);
// _numatom_index.emplace(val, newc.get());
// }
// return newc;
// }
//
// template<>
// Handle create_cell<StrAtomCell>(std::string val) {
// {
// std::lock_guard l(_cells_lock);
// if (_stratom_index.contains(val)) {
// _stratom_index.at(val)->live = true;
// return _stratom_index.at(val);
// }
// }
// Handle newc = alloc_cell<StrAtomCell>(val);
// {
// std::lock_guard l(_cells_lock);
// _stratom_index.emplace(std::move(val), newc.get());
// }
// return newc;
// }
template<>
Handle create_cell<NumAtomCell>(CellValType val) {
std::optional<Handle> ret = run_dirty<std::optional<Handle>>([&](std::function<void(Cell *)> dirty) -> std::optional<Handle> {
std::lock_guard il(_indexes_lock);
if (_numatom_index.contains(val)) {
dirty(_numatom_index.at(val));
return _numatom_index.at(val);
} else {
return std::nullopt;
}
});
if (ret.has_value()) return *ret;
Handle newc = alloc_cell<NumAtomCell>(val);
{
std::lock_guard il(_indexes_lock);
_numatom_index.emplace(val, newc.get());
}
return newc;
}
template<>
Handle create_cell<StrAtomCell>(std::string val) {
std::optional<Handle> ret = run_dirty<std::optional<Handle>>([&](std::function<void(Cell *)> dirty) -> std::optional<Handle> {
std::lock_guard il(_indexes_lock);
if (_stratom_index.contains(val)) {
dirty(_stratom_index.at(val));
return _stratom_index.at(val);
} else {
return std::nullopt;
}
});
if (ret.has_value()) return *ret;
Handle newc = alloc_cell<StrAtomCell>(val);
{
std::lock_guard il(_indexes_lock);
_stratom_index.emplace(val, newc.get());
}
return newc;
}
class Handle {
public:
@@ -76,16 +86,7 @@ public:
Cell *get() const noexcept { return _target; }
bool operator==(const Handle &rhs) const {
if (_target == rhs._target) {
return true;
} else if ((_target != nullptr && rhs._target != nullptr) && (_target->_type == rhs._target->_type)) {
if (_target->_type == CellType::NUMATOM) {
return dynamic_cast<NumAtomCell &>(*_target)._val == dynamic_cast<NumAtomCell &>(*rhs._target)._val;
} else if (_target->_type == CellType::STRATOM) {
return dynamic_cast<StrAtomCell &>(*_target)._val == dynamic_cast<StrAtomCell &>(*rhs._target)._val;
}
}
return false;
return _target == rhs._target;
}
private:
@@ -112,7 +113,11 @@ public:
return _cells_num;
}
void run_dirty(const Handle &h, std::function<void()> f);
template<typename R>
R run_dirty(const std::function<R(std::function<void(Cell *)>)> &f) {
std::lock_guard l(_gc_dirty_notif_queue_lock);
return f([&](Cell *c) { _gc_dirty_notif_queue.emplace(c); });
}
private:
template<typename CT, typename... Args>
@@ -160,6 +165,8 @@ private:
std::set<Cell *> _cells;
std::atomic<size_t> _cells_num = 0;
std::set<Cell *> _temp_cells;
std::mutex _indexes_lock;
std::unordered_map<CellValType, Cell *> _numatom_index;
std::unordered_map<std::string, Cell *> _stratom_index;

6
src/vm/src/ConsUtils.cpp
View File

@@ -40,13 +40,15 @@ MCHandle ConsUtils::makeStrCell(std::string val) {
}
void ConsUtils::setcar(const MCHandle &to, const MCHandle &car) {
CURRENT_MC.load()->run_dirty(to, [&] {
CURRENT_MC.load()->run_dirty<void>([&](std::function<void(Cell *)> dirty) -> void {
dirty(car.get());
dynamic_cast<ConsCell &>(*to)._car = car.get();
});
}
void ConsUtils::setcdr(const MCHandle &to, const MCHandle &cdr) {
CURRENT_MC.load()->run_dirty(to, [&] {
CURRENT_MC.load()->run_dirty<void>([&](std::function<void(Cell *)> dirty) -> void {
dirty(cdr.get());
dynamic_cast<ConsCell &>(*to)._cdr = cdr.get();
});
}

25
src/vm/src/MemoryContext.cpp
View File

@@ -65,15 +65,6 @@ void MemoryContext::remove_root(Cell *c) {
}
}
void MemoryContext::run_dirty(const MemoryContext::Handle &h, std::function<void()> f) {
{
std::lock_guard l(_gc_dirty_notif_queue_lock);
// std::cerr << "dirtied: " << h.get() << "\n";
_gc_dirty_notif_queue.emplace(h.get());
f();
}
}
void MemoryContext::gc_thread_entry() {
while (true) {
{
@@ -188,13 +179,15 @@ void MemoryContext::gc_thread_entry() {
if (!l->live) {
freed += 1;
// if (l->_type == CellType::NUMATOM) {
// std::cerr << "deleting num: " << l << "\n";
// _numatom_index.erase(dynamic_cast<NumAtomCell &>(*l)._val);
// } else if (l->_type == CellType::STRATOM) {
// std::cerr << "deleting str: " << l << "\n";
// _stratom_index.erase(dynamic_cast<StrAtomCell &>(*l)._val);
// }
if (l->_type == CellType::NUMATOM) {
std::lock_guard il(_indexes_lock);
// std::cerr << "deleting num: " << l << "\n";
_numatom_index.erase(dynamic_cast<NumAtomCell &>(*l)._val);
} else if (l->_type == CellType::STRATOM) {
std::lock_guard il(_indexes_lock);
// std::cerr << "deleting str: " << l << "\n";
_stratom_index.erase(dynamic_cast<StrAtomCell &>(*l)._val);
}
assert(!_roots.contains(l));
// std::cerr << "deleting: " << l << "\n";