RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-15 03:27:10 +00:00
Code Issues Projects Releases Wiki Activity

Use thread_local counter in logs for thread index.

Browse Source
This commit is contained in:
John Preston 2019-11-14 20:03:44 +03:00
parent 8b14249cd2
commit 3a7faffa3a
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/logs.cpp
View File

@ -8,10 +8,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "logs.h"
#include "platform/platform_specific.h"
#include "mtproto/connection.h"
#include "core/crash_reports.h"
#include "core/launcher.h"
namespace {
std::atomic<int> ThreadCounter/* = 0*/;
} // namespace
enum LogDataType {
LogDataMain,
LogDataDebug,
@ -45,11 +50,10 @@ QString _logsFilePath(LogDataType type, const QString &postfix = QString()) {
int32 LogsStartIndexChosen = -1;
QString _logsEntryStart() {
static int32 index = 0;
QDateTime tm(QDateTime::currentDateTime());
static thread_local auto threadId = ThreadCounter++;
static auto index = 0;
auto thread = qobject_cast<MTP::internal::Thread*>(QThread::currentThread());
auto threadId = thread ? thread->getThreadIndex() : 0;
const auto tm = QDateTime::currentDateTime();
return QString("[%1 %2-%3]").arg(tm.toString("hh:mm:ss.zzz")).arg(QString("%1").arg(threadId, 2, 10, QChar('0'))).arg(++index, 7, 10, QChar('0'));
}

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

@ -103,7 +103,7 @@ Connection::Connection(not_null<Instance*> instance)
void Connection::start(SessionData *sessionData, ShiftedDcId shiftedDcId) {
Expects(_thread == nullptr && _private == nullptr);
_thread = std::make_unique<Thread>();
_thread = std::make_unique<QThread>();
auto newData = std::make_unique<ConnectionPrivate>(
_instance,
_thread.get(),

18
Telegram/SourceFiles/mtproto/connection.h
View File

@ -33,24 +33,6 @@ class SessionData;
class RSAPublicKey;
struct ConnectionOptions;
class Thread : public QThread {
// The Q_OBJECT meta info is used for qobject_cast!
Q_OBJECT
public:
Thread() {
static int ThreadCounter = 0;
_threadIndex = ++ThreadCounter;
}
int getThreadIndex() const {
return _threadIndex;
}
private:
int _threadIndex = 0;
};
class Connection {
public:
enum ConnectionType {