mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Use crl::time/now instead of TimeMs/getms.

Browse Source
This commit is contained in:
John Preston
2019-02-19 10:57:53 +04:00
parent d208236994
commit fe618bd652
310 changed files with 1133 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Telegram/SourceFiles/mtproto/connection.cpp
View File

@@ -39,19 +39,19 @@ namespace {
constexpr auto kRecreateKeyId = AuthKey::KeyId(0xFFFFFFFFFFFFFFFFULL);
constexpr auto kIntSize = static_cast<int>(sizeof(mtpPrime));
constexpr auto kMaxModExpSize = 256;
constexpr auto kWaitForBetterTimeout = TimeMs(2000);
constexpr auto kMinConnectedTimeout = TimeMs(1000);
constexpr auto kMaxConnectedTimeout = TimeMs(8000);
constexpr auto kMinReceiveTimeout = TimeMs(4000);
constexpr auto kMaxReceiveTimeout = TimeMs(64000);
constexpr auto kMarkConnectionOldTimeout = TimeMs(192000);
constexpr auto kWaitForBetterTimeout = crl::time(2000);
constexpr auto kMinConnectedTimeout = crl::time(1000);
constexpr auto kMaxConnectedTimeout = crl::time(8000);
constexpr auto kMinReceiveTimeout = crl::time(4000);
constexpr auto kMaxReceiveTimeout = crl::time(64000);
constexpr auto kMarkConnectionOldTimeout = crl::time(192000);
constexpr auto kPingDelayDisconnect = 60;
constexpr auto kPingSendAfter = TimeMs(30000);
constexpr auto kPingSendAfterForce = TimeMs(45000);
constexpr auto kPingSendAfter = crl::time(30000);
constexpr auto kPingSendAfterForce = crl::time(45000);
constexpr auto kTestModeDcIdShift = 10000;
// If we can't connect for this time we will ask _instance to update config.
constexpr auto kRequestConfigTimeout = TimeMs(8000);
constexpr auto kRequestConfigTimeout = crl::time(8000);
// Don't try to handle messages larger than this size.
constexpr auto kMaxMessageLength = 16 * 1024 * 1024;
@@ -474,7 +474,7 @@ int32 ConnectionPrivate::getState() const {
int32 result = _state;
if (_state < 0) {
if (_retryTimer.isActive()) {
result = int32(getms(true) - _retryWillFinish);
result = int32(crl::now() - _retryWillFinish);
if (result >= 0) {
result = -1;
}
@@ -504,7 +504,7 @@ bool ConnectionPrivate::setState(int32 state, int32 ifState) {
if (state < 0) {
_retryTimeout = -state;
_retryTimer.callOnce(_retryTimeout);
_retryWillFinish = getms(true) + _retryTimeout;
_retryWillFinish = crl::now() + _retryTimeout;
}
emit stateChanged(state);
return true;
@@ -733,7 +733,7 @@ void ConnectionPrivate::tryToSend() {
auto prependOnly = (state != ConnectedState);
auto pingRequest = SecureRequest();
if (_shiftedDcId == BareDcId(_shiftedDcId)) { // main session
if (!prependOnly && !_pingIdToSend && !_pingId && _pingSendAt <= getms(true)) {
if (!prependOnly && !_pingIdToSend && !_pingId && _pingSendAt <= crl::now()) {
_pingIdToSend = rand_value<mtpPingId>();
}
}
@@ -752,7 +752,7 @@ void ConnectionPrivate::tryToSend() {
"ping_id: %1").arg(_pingIdToSend));
}
pingRequest->msDate = getms(true); // > 0 - can send without container
pingRequest->msDate = crl::now(); // > 0 - can send without container
_pingSendAt = pingRequest->msDate + kPingSendAfter;
pingRequest->requestId = 0; // dont add to haveSent / wereAcked maps
@@ -775,7 +775,7 @@ void ConnectionPrivate::tryToSend() {
if (!prependOnly && !ackRequestData.isEmpty()) {
ackRequest = SecureRequest::Serialize(MTPMsgsAck(
MTP_msgs_ack(MTP_vector<MTPlong>(ackRequestData))));
ackRequest->msDate = getms(true); // > 0 - can send without container
ackRequest->msDate = crl::now(); // > 0 - can send without container
ackRequest->requestId = 0; // dont add to haveSent / wereAcked maps
ackRequestData.clear();
@@ -783,7 +783,7 @@ void ConnectionPrivate::tryToSend() {
if (!prependOnly && !resendRequestData.isEmpty()) {
resendRequest = SecureRequest::Serialize(MTPMsgResendReq(
MTP_msg_resend_req(MTP_vector<MTPlong>(resendRequestData))));
resendRequest->msDate = getms(true); // > 0 - can send without container
resendRequest->msDate = crl::now(); // > 0 - can send without container
resendRequest->requestId = 0; // dont add to haveSent / wereAcked maps
resendRequestData.clear();
@@ -804,13 +804,13 @@ void ConnectionPrivate::tryToSend() {
if (!stateReq.isEmpty()) {
stateRequest = SecureRequest::Serialize(MTPMsgsStateReq(
MTP_msgs_state_req(MTP_vector<MTPlong>(stateReq))));
stateRequest->msDate = getms(true); // > 0 - can send without container
stateRequest->msDate = crl::now(); // > 0 - can send without container
stateRequest->requestId = GetNextRequestId();// add to haveSent / wereAcked maps, but don't add to requestMap
}
if (_connection->usingHttpWait()) {
httpWaitRequest = SecureRequest::Serialize(MTPHttpWait(
MTP_http_wait(MTP_int(100), MTP_int(30), MTP_int(25000))));
httpWaitRequest->msDate = getms(true); // > 0 - can send without container
httpWaitRequest->msDate = crl::now(); // > 0 - can send without container
httpWaitRequest->requestId = 0; // dont add to haveSent / wereAcked maps
}
}
@@ -893,7 +893,7 @@ void ConnectionPrivate::tryToSend() {
if (toSendRequest->requestId) {
if (toSendRequest.needAck()) {
toSendRequest->msDate = toSendRequest.isStateRequest() ? 0 : getms(true);
toSendRequest->msDate = toSendRequest.isStateRequest() ? 0 : crl::now();
QWriteLocker locker2(sessionData->haveSentMutex());
auto &haveSent = sessionData->haveSentMap();
@@ -989,7 +989,7 @@ void ConnectionPrivate::tryToSend() {
bool added = false;
if (req->requestId) {
if (req.needAck()) {
req->msDate = req.isStateRequest() ? 0 : getms(true);
req->msDate = req.isStateRequest() ? 0 : crl::now();
int32 reqNeedsLayer = (needsLayer && req->needsLayer) ? toSendRequest->size() : 0;
if (req->after) {
wrapInvokeAfter(toSendRequest, req, haveSent, reqNeedsLayer ? initSizeInInts : 0);
@@ -1169,8 +1169,8 @@ void ConnectionPrivate::connectToServer(bool afterConfig) {
).arg(_testConnections.size()));
if (!_startedConnectingAt) {
_startedConnectingAt = getms(true);
} else if (getms(true) - _startedConnectingAt > kRequestConfigTimeout) {
_startedConnectingAt = crl::now();
} else if (crl::now() - _startedConnectingAt > kRequestConfigTimeout) {
InvokeQueued(_instance, [instance = _instance] {
instance->requestConfigIfOld();
});
@@ -1243,7 +1243,7 @@ void ConnectionPrivate::onSentSome(uint64 size) {
}
_waitForReceivedTimer.callOnce(remain);
}
if (!firstSentAt) firstSentAt = getms(true);
if (!firstSentAt) firstSentAt = crl::now();
}
void ConnectionPrivate::onReceivedSome() {
@@ -1254,7 +1254,7 @@ void ConnectionPrivate::onReceivedSome() {
_oldConnectionTimer.callOnce(kMarkConnectionOldTimeout);
_waitForReceivedTimer.cancel();
if (firstSentAt > 0) {
const auto ms = getms(true) - firstSentAt;
const auto ms = crl::now() - firstSentAt;
DEBUG_LOG(("MTP Info: response in %1ms, _waitForReceived: %2ms").arg(ms).arg(_waitForReceived));
if (ms > 0 && ms * 2 < _waitForReceived) {
@@ -1274,7 +1274,7 @@ void ConnectionPrivate::sendPingByTimer() {
if (_pingId) {
// _pingSendAt: when to send next ping (lastPingAt + kPingSendAfter)
// could be equal to zero.
const auto now = getms(true);
const auto now = crl::now();
const auto mustSendTill = _pingSendAt
+ kPingSendAfterForce
- kPingSendAfter;
@@ -1594,7 +1594,7 @@ void ConnectionPrivate::handleReceived() {
DEBUG_LOG(("MTP Info: marked auth key as checked"));
sessionData->setCheckedKey(true);
}
_startedConnectingAt = TimeMs(0);
_startedConnectingAt = crl::time(0);
if (!wasConnected) {
if (getState() == ConnectedState) {