Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-21 04:44:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed deadlock when receiving a chat message with open history browser.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-03-20 21:25:39 +00:00
parent d765721e83
commit 9f627783aa
1 changed files with 75 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/pqi/p3historymgr.cc
View file

@ -52,6 +52,9 @@ p3HistoryMgr::~p3HistoryMgr()
/***** p3HistoryMgr *****/ /***** p3HistoryMgr *****/
void p3HistoryMgr::addMessage(bool incoming, const std::string &chatPeerId, const std::string &peerId, const RsChatMsgItem *chatItem) void p3HistoryMgr::addMessage(bool incoming, const std::string &chatPeerId, const std::string &peerId, const RsChatMsgItem *chatItem)
{
uint32_t addMsgId = 0;
{ {
RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/
@ -86,6 +89,7 @@ void p3HistoryMgr::addMessage(bool incoming, const std::string &chatPeerId, cons
if (mit != mMessages.end()) { if (mit != mMessages.end()) {
item->msgId = nextMsgId++; item->msgId = nextMsgId++;
mit->second.insert(std::make_pair(item->msgId, item)); mit->second.insert(std::make_pair(item->msgId, item));
addMsgId = item->msgId;
// check the limit // check the limit
uint32_t limit; uint32_t limit;
@ -106,13 +110,17 @@ void p3HistoryMgr::addMessage(bool incoming, const std::string &chatPeerId, cons
item->msgId = nextMsgId++; item->msgId = nextMsgId++;
msgs.insert(std::make_pair(item->msgId, item)); msgs.insert(std::make_pair(item->msgId, item));
mMessages.insert(std::make_pair(item->chatPeerId, msgs)); mMessages.insert(std::make_pair(item->chatPeerId, msgs));
addMsgId = item->msgId;
// no need to check the limit // no need to check the limit
} }
IndicateConfigChanged(); IndicateConfigChanged();
}
rsicontrol->getNotify().notifyHistoryChanged(item->msgId, NOTIFY_TYPE_ADD); if (addMsgId) {
rsicontrol->getNotify().notifyHistoryChanged(addMsgId, NOTIFY_TYPE_ADD);
}
} }
/***** p3Config *****/ /***** p3Config *****/
@ -319,6 +327,7 @@ bool p3HistoryMgr::getMessage(uint32_t msgId, HistoryMsg &msg)
} }
void p3HistoryMgr::clear(const std::string &chatPeerId) void p3HistoryMgr::clear(const std::string &chatPeerId)
{
{ {
RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/
@ -335,6 +344,7 @@ void p3HistoryMgr::clear(const std::string &chatPeerId)
mMessages.erase(mit); mMessages.erase(mit);
IndicateConfigChanged(); IndicateConfigChanged();
}
rsicontrol->getNotify().notifyHistoryChanged(0, NOTIFY_TYPE_MOD); rsicontrol->getNotify().notifyHistoryChanged(0, NOTIFY_TYPE_MOD);
} }