xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure ClientManager is always outliving the BufferManager

Browse Source
This commit is contained in:
Maxime Coste 2016-03-02 13:30:11 +00:00
parent 068ca08b4c
commit 72dc8e6774
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/buffer_manager.cc
View File

@ -16,11 +16,21 @@ struct name_not_unique : runtime_error
name_not_unique() : runtime_error("buffer name is already in use") {} name_not_unique() : runtime_error("buffer name is already in use") {}
}; };
BufferManager::BufferManager()
{
kak_assert(ClientManager::has_instance());
}
BufferManager::~BufferManager() BufferManager::~BufferManager()
{ {
kak_assert(ClientManager::has_instance());
// delete remaining buffers // delete remaining buffers
while (not m_buffers.empty()) while (not m_buffers.empty())
{
ClientManager::instance().ensure_no_client_uses_buffer(*m_buffers.front().get());
delete m_buffers.front().get(); delete m_buffers.front().get();
}
} }
void BufferManager::register_buffer(Buffer& buffer) void BufferManager::register_buffer(Buffer& buffer)
@ -62,8 +72,7 @@ void BufferManager::delete_buffer(Buffer& buffer)
{ return p.get() == &buffer; }); { return p.get() == &buffer; });
kak_assert(it != m_buffers.end()); kak_assert(it != m_buffers.end());
if (ClientManager::has_instance()) ClientManager::instance().ensure_no_client_uses_buffer(buffer);
ClientManager::instance().ensure_no_client_uses_buffer(buffer);
m_buffers.erase(it); m_buffers.erase(it);
m_buffer_trash.emplace_back(&buffer); m_buffer_trash.emplace_back(&buffer);
@ -106,8 +115,7 @@ void BufferManager::clear_buffer_trash()
// Do that again, to be tolerant in some corner cases, where a buffer is // Do that again, to be tolerant in some corner cases, where a buffer is
// deleted during its creation // deleted during its creation
if (ClientManager::has_instance()) ClientManager::instance().ensure_no_client_uses_buffer(*buffer);
ClientManager::instance().ensure_no_client_uses_buffer(*buffer);
delete buffer; delete buffer;
} }

1
src/buffer_manager.hh
View File

@ -16,6 +16,7 @@ public:
using BufferList = Vector<SafePtr<Buffer>>; using BufferList = Vector<SafePtr<Buffer>>;
using iterator = BufferList::const_iterator; using iterator = BufferList::const_iterator;
BufferManager();
~BufferManager(); ~BufferManager();
void register_buffer(Buffer& buffer); void register_buffer(Buffer& buffer);