From f9d3921136d21fe865bab118a1ca4f684effc357 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 20 Sep 2015 12:54:22 +0300 Subject: [PATCH] improved pts skipped updates handler --- Telegram/SourceFiles/mainwidget.cpp | 115 +++++++++++++++++++++------- Telegram/SourceFiles/mainwidget.h | 1 + Telegram/SourceFiles/structs.cpp | 36 ++++++--- Telegram/SourceFiles/structs.h | 19 +++-- 4 files changed, 127 insertions(+), 44 deletions(-) diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 8fde432e2..04d8b8733 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -786,7 +786,10 @@ void MainWidget::deleteHistoryAfterLeave(PeerData *peer, const MTPUpdates &updat void MainWidget::deleteHistoryPart(PeerData *peer, const MTPmessages_AffectedHistory &result) { const MTPDmessages_affectedHistory &d(result.c_messages_affectedHistory()); - ptsUpdated(d.vpts.v, d.vpts_count.v); + if (ptsUpdated(d.vpts.v, d.vpts_count.v)) { + ptsApplySkippedUpdates(); + App::emitPeerUpdated(); + } int32 offset = d.voffset.v; if (!MTP::authedId()) return; @@ -1579,8 +1582,11 @@ void MainWidget::channelWasRead(PeerData *peer, const MTPBool &result) { void MainWidget::partWasRead(PeerData *peer, const MTPmessages_AffectedHistory &result) { const MTPDmessages_affectedHistory &d(result.c_messages_affectedHistory()); - ptsUpdated(d.vpts.v, d.vpts_count.v); - + if (ptsUpdated(d.vpts.v, d.vpts_count.v)) { + ptsApplySkippedUpdates(); + App::emitPeerUpdated(); + } + int32 offset = d.voffset.v; if (!MTP::authedId() || offset <= 0) { readRequestDone(peer); @@ -1608,9 +1614,15 @@ void MainWidget::readRequestDone(PeerData *peer) { void MainWidget::messagesAffected(PeerData *peer, const MTPmessages_AffectedMessages &result) { const MTPDmessages_affectedMessages &d(result.c_messages_affectedMessages()); if (peer && peer->isChannel()) { - peer->asChannel()->ptsUpdated(d.vpts.v, d.vpts_count.v); + if (peer->asChannel()->ptsUpdated(d.vpts.v, d.vpts_count.v)) { + peer->asChannel()->ptsApplySkippedUpdates(); + App::emitPeerUpdated(); + } } else { - ptsUpdated(d.vpts.v, d.vpts_count.v); + if (ptsUpdated(d.vpts.v, d.vpts_count.v)) { + ptsApplySkippedUpdates(); + App::emitPeerUpdated(); + } } if (History *h = App::historyLoaded(peer->id)) { if (!h->lastMsg) { @@ -2263,8 +2275,7 @@ void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back) _topBar.hide(); resizeEvent(0); } else if (wasActivePeer != activePeer() && activePeer()->isChannel()) { - activePeer()->asChannel()->ptsWaitingForShortPoll(true); - ptsWaiterStartTimerFor(history.peer()->asChannel(), WaitForChannelGetDifference); + activePeer()->asChannel()->ptsWaitingForShortPoll(WaitForChannelGetDifference); } if (!cWideMode() && !dialogs.isHidden()) dialogs.hide(); if (!animating()) { @@ -2277,7 +2288,7 @@ void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back) } } //if (wasActivePeer && wasActivePeer->isChannel() && activePeer() != wasActivePeer) { - // wasActivePeer->asChannel()->ptsStopShortPoll(); + // wasActivePeer->asChannel()->ptsWaitingForShortPoll(false); //} if (!dialogs.isHidden()) { @@ -2934,8 +2945,7 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received }%1").arg(cTestMode() ? " TESTMODE" : "")); getChannelDifference(channel); } else if (activePeer() == channel) { - channel->ptsWaitingForShortPoll(true); - ptsWaiterStartTimerFor(channel, timeout ? (timeout * 1000) : WaitForChannelGetDifference); + channel->ptsWaitingForShortPoll(timeout ? (timeout * 1000) : WaitForChannelGetDifference); } App::emitPeerUpdated(); @@ -3084,6 +3094,10 @@ bool MainWidget::ptsUpdated(int32 pts, int32 ptsCount, const MTPUpdate &update) return _ptsWaiter.updated(0, pts, ptsCount, update); } +void MainWidget::ptsApplySkippedUpdates() { + return _ptsWaiter.applySkippedUpdates(0); +} + void MainWidget::feedDifference(const MTPVector &users, const MTPVector &chats, const MTPVector &msgs, const MTPVector &other) { App::wnd()->checkAutoLock(); App::feedUsers(users, false); @@ -3169,8 +3183,6 @@ void MainWidget::getDifference() { _bySeqUpdates.clear(); _bySeqTimer.stop(); - _ptsWaiter.clearSkippedUpdates(); - noUpdatesTimer.stop(); _getDifferenceTimeAfterFail = 0; @@ -3190,14 +3202,13 @@ void MainWidget::getChannelDifference(ChannelData *channel, GetChannelDifference LOG(("Getting channel difference!")); if (!channel->ptsInited() || channel->ptsRequesting()) return; - channel->ptsClearSkippedUpdates(); - if (from != GetChannelDifferenceFromFail) { _channelGetDifferenceTimeAfterFail.remove(channel); } LOG(("Getting channel difference for %1").arg(channel->pts())); channel->ptsSetRequesting(true); + MTPChannelMessagesFilter filter; if (activePeer() == channel) { filter = MTP_channelMessagesFilterEmpty(); @@ -3819,9 +3830,12 @@ void MainWidget::handleUpdates(const MTPUpdates &updates, uint64 randomId) { MTP_LOG(0, ("getDifference { good - getting user for updateShortMessage }%1").arg(cTestMode() ? " TESTMODE" : "")); return getDifference(); } + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, updates)) { return; } + + // update before applying skipped int32 flags = d.vflags.v | MTPDmessage::flag_from_id; bool out = (flags & MTPDmessage_flag_out); HistoryItem *item = App::histories().addNewMessage(MTP_message(MTP_int(flags), d.vid, out ? MTP_int(MTP::authedId()) : d.vuser_id, MTP_peerUser(out ? d.vuser_id : MTP_int(MTP::authedId())), d.vfwd_from_id, d.vfwd_date, d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup, d.has_entities() ? d.ventities : MTPnullEntities, MTPint()), NewMessageUnread); @@ -3829,6 +3843,8 @@ void MainWidget::handleUpdates(const MTPUpdates &updates, uint64 randomId) { history.peerMessagesUpdated(item->history()->peer->id); } + ptsApplySkippedUpdates(); + updSetState(0, d.vdate.v, updQts, updSeq); } break; @@ -3840,9 +3856,12 @@ void MainWidget::handleUpdates(const MTPUpdates &updates, uint64 randomId) { if (noFrom) App::api()->requestFullPeer(App::chatLoaded(d.vchat_id.v)); return getDifference(); } + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, updates)) { return; } + + // update before applying skipped int32 flags = d.vflags.v | MTPDmessage::flag_from_id; bool out = (flags & MTPDmessage_flag_out); HistoryItem *item = App::histories().addNewMessage(MTP_message(MTP_int(flags), d.vid, d.vfrom_id, MTP_peerChat(d.vchat_id), d.vfwd_from_id, d.vfwd_date, d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup, d.has_entities() ? d.ventities : MTPnullEntities, MTPint()), NewMessageUnread); @@ -3850,6 +3869,8 @@ void MainWidget::handleUpdates(const MTPUpdates &updates, uint64 randomId) { history.peerMessagesUpdated(item->history()->peer->id); } + ptsApplySkippedUpdates(); + updSetState(0, d.vdate.v, updQts, updSeq); } break; @@ -3884,6 +3905,8 @@ void MainWidget::handleUpdates(const MTPUpdates &updates, uint64 randomId) { if (!ptsUpdated(d.vpts.v, d.vpts_count.v, updates)) { return; } + // update before applying skipped + ptsApplySkippedUpdates(); updSetState(0, d.vdate.v, updQts, updSeq); } break; @@ -3901,17 +3924,21 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { switch (update.type()) { case mtpc_updateNewMessage: { const MTPDupdateNewMessage &d(update.c_updateNewMessage()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped if (d.vmessage.type() == mtpc_message) { // index forwarded messages to links overview App::checkEntitiesAndViewsUpdate(d.vmessage.c_message()); } - HistoryItem *item = App::histories().addNewMessage(d.vmessage, NewMessageUnread); if (item) { history.peerMessagesUpdated(item->history()->peer->id); } + + ptsApplySkippedUpdates(); } break; case mtpc_updateMessageID: { @@ -3957,9 +3984,12 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { case mtpc_updateReadMessagesContents: { const MTPDupdateReadMessagesContents &d(update.c_updateReadMessagesContents()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped const QVector &v(d.vmessages.c_vector().v); for (int32 i = 0, l = v.size(); i < l; ++i) { if (HistoryItem *item = App::histItemById(NoChannel, v.at(i).v)) { @@ -3972,43 +4002,65 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { } } } + + ptsApplySkippedUpdates(); } break; case mtpc_updateReadHistoryInbox: { const MTPDupdateReadHistoryInbox &d(update.c_updateReadHistoryInbox()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped App::feedInboxRead(peerFromMTP(d.vpeer), d.vmax_id.v); + + ptsApplySkippedUpdates(); } break; case mtpc_updateReadHistoryOutbox: { const MTPDupdateReadHistoryOutbox &d(update.c_updateReadHistoryOutbox()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped PeerId id = peerFromMTP(d.vpeer); App::feedOutboxRead(id, d.vmax_id.v); if (history.peer() && history.peer()->id == id) history.update(); + + ptsApplySkippedUpdates(); } break; case mtpc_updateWebPage: { const MTPDupdateWebPage &d(update.c_updateWebPage()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped App::feedWebPage(d.vwebpage); history.updatePreview(); webPagesUpdate(); + + ptsApplySkippedUpdates(); } break; case mtpc_updateDeleteMessages: { const MTPDupdateDeleteMessages &d(update.c_updateDeleteMessages()); + if (!ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { return; } + + // update before applying skipped App::feedWereDeleted(NoChannel, d.vmessages.c_vector().v); history.peerMessagesUpdated(); + + ptsApplySkippedUpdates(); } break; case mtpc_updateUserTyping: { @@ -4208,20 +4260,24 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { case mtpc_updateNewChannelMessage: { const MTPDupdateNewChannelMessage &d(update.c_updateNewChannelMessage()); - PeerId peer = peerFromMessage(d.vmessage); - if (ChannelData *channel = App::channelLoaded(peerToChannel(peer))) { - if (!channel->ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { - return; - } + ChannelData *channel = App::channelLoaded(peerToChannel(peerFromMessage(d.vmessage))); + + if (channel && !channel->ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { + return; } + + // update before applying skipped if (d.vmessage.type() == mtpc_message) { // index forwarded messages to links overview App::checkEntitiesAndViewsUpdate(d.vmessage.c_message()); } - HistoryItem *item = App::histories().addNewMessage(d.vmessage, NewMessageUnread); if (item) { history.peerMessagesUpdated(item->history()->peer->id); } + + if (channel) { + channel->ptsApplySkippedUpdates(); + } } break; case mtpc_updateReadChannelInbox: { @@ -4231,18 +4287,25 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { case mtpc_updateDeleteChannelMessages: { const MTPDupdateDeleteChannelMessages &d(update.c_updateDeleteChannelMessages()); - if (ChannelData *channel = App::channelLoaded(d.vchannel_id.v)) { - if (!channel->ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { - return; - } + ChannelData *channel = App::channelLoaded(d.vchannel_id.v); + + if (channel && !channel->ptsUpdated(d.vpts.v, d.vpts_count.v, update)) { + return; } + + // update before applying skipped App::feedWereDeleted(d.vchannel_id.v, d.vmessages.c_vector().v); history.peerMessagesUpdated(); + + if (channel) { + channel->ptsApplySkippedUpdates(); + } } break; case mtpc_updateChannelGroup: { const MTPDupdateChannelGroup &d(update.c_updateChannelGroup()); - if (ChannelData *channel = App::channelLoaded(d.vchannel_id.v)) { + ChannelData *channel = App::channelLoaded(d.vchannel_id.v); + if (channel) { if (d.vgroup.type() == mtpc_messageGroup) { const MTPDmessageGroup &data(d.vgroup.c_messageGroup()); // CHANNELS_FULL diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 4ee446def..099d6052e 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -554,6 +554,7 @@ private: bool ptsUpdated(int32 pts, int32 ptsCount); bool ptsUpdated(int32 pts, int32 ptsCount, const MTPUpdates &updates); bool ptsUpdated(int32 pts, int32 ptsCount, const MTPUpdate &update); + void ptsApplySkippedUpdates(); PtsWaiter _ptsWaiter; typedef QMap ChannelGetDifferenceTime; diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index 720a64fee..eae30c7e6 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -382,14 +382,28 @@ uint64 PtsWaiter::ptsKey(PtsSkippedQueue queue) { return _queue.insert(uint64(uint32(_last)) << 32 | uint64(uint32(_count)), queue).key(); } -void PtsWaiter::setWaitingForSkipped(ChannelData *channel, bool waiting) { - _waitingForSkipped = waiting; - checkForWaiting(channel); +void PtsWaiter::setWaitingForSkipped(ChannelData *channel, int32 ms) { + if (ms >= 0) { + if (App::main()) { + App::main()->ptsWaiterStartTimerFor(channel, ms); + } + _waitingForSkipped = true; + } else { + _waitingForSkipped = false; + checkForWaiting(channel); + } } -void PtsWaiter::setWaitingForShortPoll(ChannelData *channel, bool waiting) { - _waitingForShortPoll = waiting; - checkForWaiting(channel); +void PtsWaiter::setWaitingForShortPoll(ChannelData *channel, int32 ms) { + if (ms >= 0) { + if (App::main()) { + App::main()->ptsWaiterStartTimerFor(channel, ms); + } + _waitingForShortPoll = true; + } else { + _waitingForShortPoll = false; + checkForWaiting(channel); + } } void PtsWaiter::checkForWaiting(ChannelData *channel) { @@ -399,7 +413,9 @@ void PtsWaiter::checkForWaiting(ChannelData *channel) { } void PtsWaiter::applySkippedUpdates(ChannelData *channel) { - setWaitingForSkipped(channel, false); + if (!_waitingForSkipped) return; + + setWaitingForSkipped(channel, -1); if (!App::main() || _queue.isEmpty()) return; @@ -412,7 +428,6 @@ void PtsWaiter::applySkippedUpdates(ChannelData *channel) { } --_applySkippedLevel; clearSkippedUpdates(); - App::emitPeerUpdated(); } void PtsWaiter::clearSkippedUpdates() { @@ -432,13 +447,12 @@ bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 count) { // retur _last = qMax(_last, pts); _count += count; if (_last == _count) { - applySkippedUpdates(channel); _good = _last; return true; } else if (_last < _count) { - if (App::main()) App::main()->ptsWaiterStartTimerFor(channel, 1); + setWaitingForSkipped(channel, 1); } else { - if (App::main()) App::main()->ptsWaiterStartTimerFor(channel, WaitForSkippedTimeout); + setWaitingForSkipped(channel, WaitForSkippedTimeout); } return !count; } diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 722a7f248..48074feaa 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -402,6 +402,9 @@ public: } void setRequesting(bool isRequesting) { _requesting = isRequesting; + if (_requesting) { + clearSkippedUpdates(); + } } bool requesting() const { return _requesting; @@ -412,8 +415,8 @@ public: bool waitingForShortPoll() const { return _waitingForShortPoll; } - void setWaitingForSkipped(ChannelData *channel, bool waiting); - void setWaitingForShortPoll(ChannelData *channel, bool waiting); + void setWaitingForSkipped(ChannelData *channel, int32 ms); // < 0 - not waiting + void setWaitingForShortPoll(ChannelData *channel, int32 ms); // < 0 - not waiting int32 current() const{ return _good; } @@ -463,7 +466,9 @@ public: _ptsWaiter.init(pts); } void ptsReceived(int32 pts) { - _ptsWaiter.updated(this, pts, 0); + if (_ptsWaiter.updated(this, pts, 0)) { + _ptsWaiter.applySkippedUpdates(this); + } } bool ptsUpdated(int32 pts, int32 count) { return _ptsWaiter.updated(this, pts, count); @@ -483,11 +488,11 @@ public: void ptsSetRequesting(bool isRequesting) { return _ptsWaiter.setRequesting(isRequesting); } - void ptsClearSkippedUpdates() { - return _ptsWaiter.clearSkippedUpdates(); + void ptsApplySkippedUpdates() { + return _ptsWaiter.applySkippedUpdates(this); } - void ptsWaitingForShortPoll(bool waiting) { - return _ptsWaiter.setWaitingForShortPoll(this, waiting); + void ptsWaitingForShortPoll(int32 ms) { // < 0 - not waiting + return _ptsWaiter.setWaitingForShortPoll(this, ms); } private: