From 9f988e3b962389e10a7cf010fd4bf0f81d70e31a Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 14 Nov 2015 03:07:21 -0500 Subject: EmergeManager: Do not queue duplicate block requests --- src/emerge.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/emerge.h') diff --git a/src/emerge.h b/src/emerge.h index a143b660f..02bdf7e67 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -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; -- cgit v1.2.3