BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

EmergeManager: Do not queue duplicate block requests

Browse Source
This commit is contained in:
kwolekr 2015-11-14 03:07:21 -05:00
parent b67eab3b00
commit 9f988e3b96
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emerge.cpp
View File

@ -292,14 +292,18 @@ bool EmergeManager::enqueueBlockEmergeEx(
void *callback_param)
{
EmergeThread *thread = NULL;
bool entry_already_exists = false;
{
MutexAutoLock queuelock(m_queue_mutex);
if (!pushBlockEmergeData(blockpos, peer_id, flags,
callback, callback_param))
callback, callback_param, &entry_already_exists))
return false;
if (entry_already_exists)
return true;
thread = getOptimalThread();
thread->pushBlock(blockpos);
}
@ -382,7 +386,8 @@ bool EmergeManager::pushBlockEmergeData(
u16 peer_requested,
u16 flags,
EmergeCompletionCallback callback,
void *callback_param)
void *callback_param,
bool *entry_already_exists)
{
u16 &count_peer = m_peer_queue_count[peer_requested];
@ -402,12 +407,12 @@ bool EmergeManager::pushBlockEmergeData(
findres = m_blocks_enqueued.insert(std::make_pair(pos, BlockEmergeData()));
BlockEmergeData &bedata = findres.first->second;
bool update_existing = !findres.second;
*entry_already_exists = !findres.second;
if (callback)
bedata.callbacks.push_back(std::make_pair(callback, callback_param));
if (update_existing) {
if (*entry_already_exists) {
bedata.flags |= flags;
} else {
bedata.flags = flags;

11
src/emerge.h
View File

@ -159,8 +159,15 @@ private:
// Requires m_queue_mutex held
EmergeThread *getOptimalThread();
bool pushBlockEmergeData(v3s16 pos, u16 peer_requested, u16 flags,
EmergeCompletionCallback callback, void *callback_param);
bool pushBlockEmergeData(
v3s16 pos,
u16 peer_requested,
u16 flags,
EmergeCompletionCallback callback,
void *callback_param,
bool *entry_already_exists);
bool popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata);
friend class EmergeThread;