Skip to content

Commit 8aac734

Browse files
dchapyshevdchapyshev
committed
Rename AsioThread to Thread.
1 parent d727a74 commit 8aac734

17 files changed

+53
-51
lines changed

‎source/base/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,10 @@ list(APPEND SOURCE_BASE_THREADING
624624
threading/asio_event_dispatcher.h
625625
threading/asio_task_runner.cc
626626
threading/asio_task_runner.h
627-
threading/asio_thread.cc
628-
threading/asio_thread.h
629627
threading/simple_thread.cc
630628
threading/simple_thread.h
629+
threading/thread.cc
630+
threading/thread.h
631631
threading/thread_checker.cc
632632
threading/thread_checker.h)
633633

‎source/base/audio/audio_capturer_wrapper.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace base {
2828
//--------------------------------------------------------------------------------------------------
2929
AudioCapturerWrapper::AudioCapturerWrapper(std::shared_ptr<IpcChannelProxy> channel_proxy)
3030
: channel_proxy_(std::move(channel_proxy)),
31-
thread_(std::make_unique<AsioThread>(AsioThread::EventDispatcher::ASIO, this))
31+
thread_(std::make_unique<Thread>(Thread::AsioDispatcher, this))
3232
{
3333
LOG(LS_INFO) << "Ctor";
3434
DCHECK(channel_proxy_);
@@ -53,7 +53,7 @@ void AudioCapturerWrapper::start()
5353
//--------------------------------------------------------------------------------------------------
5454
void AudioCapturerWrapper::onBeforeThreadRunning()
5555
{
56-
thread_->setPriority(AsioThread::HighestPriority);
56+
thread_->setPriority(Thread::HighestPriority);
5757

5858
capturer_ = AudioCapturer::create();
5959
if (!capturer_)

‎source/base/audio/audio_capturer_wrapper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
#ifndef BASE_AUDIO_AUDIO_CAPTURER_WRAPPER_H
2020
#define BASE_AUDIO_AUDIO_CAPTURER_WRAPPER_H
2121

22-
#include "base/threading/asio_thread.h"
22+
#include "base/threading/thread.h"
2323
#include "proto/desktop_internal.pb.h"
2424

2525
namespace base {
2626

2727
class AudioCapturer;
2828
class IpcChannelProxy;
2929

30-
class AudioCapturerWrapper final : public AsioThread::Delegate
30+
class AudioCapturerWrapper final : public Thread::Delegate
3131
{
3232
public:
3333
explicit AudioCapturerWrapper(std::shared_ptr<IpcChannelProxy> channel_proxy);
@@ -42,7 +42,7 @@ class AudioCapturerWrapper final : public AsioThread::Delegate
4242

4343
private:
4444
std::shared_ptr<IpcChannelProxy> channel_proxy_;
45-
std::unique_ptr<AsioThread> thread_;
45+
std::unique_ptr<Thread> thread_;
4646
std::unique_ptr<AudioCapturer> capturer_;
4747
proto::internal::DesktopToService outgoing_message_;
4848

‎source/base/ipc/ipc_channel.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "base/ipc/ipc_channel_proxy.h"
2424
#include "base/strings/unicode.h"
2525
#include "base/threading/asio_event_dispatcher.h"
26-
#include "base/threading/asio_thread.h"
26+
#include "base/threading/thread.h"
2727

2828
#include <asio/read.hpp>
2929
#include <asio/write.hpp>
@@ -176,7 +176,7 @@ void IpcChannel::Handler::onReadData(const std::error_code& error_code, size_t b
176176
IpcChannel::IpcChannel(QObject* parent)
177177
: QObject(parent),
178178
stream_(AsioEventDispatcher::currentIoContext()),
179-
proxy_(new IpcChannelProxy(AsioThread::currentTaskRunner(), this)),
179+
proxy_(new IpcChannelProxy(Thread::currentTaskRunner(), this)),
180180
handler_(base::make_local_shared<Handler>(this))
181181
{
182182
LOG(LS_INFO) << "Ctor";
@@ -187,7 +187,7 @@ IpcChannel::IpcChannel(const QString& channel_name, Stream&& stream, QObject* pa
187187
: QObject(parent),
188188
channel_name_(channel_name),
189189
stream_(std::move(stream)),
190-
proxy_(new IpcChannelProxy(AsioThread::currentTaskRunner(), this)),
190+
proxy_(new IpcChannelProxy(Thread::currentTaskRunner(), this)),
191191
is_connected_(true),
192192
handler_(base::make_local_shared<Handler>(this))
193193
{

‎source/base/net/tcp_channel.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "base/net/tcp_channel_proxy.h"
2727
#include "base/strings/unicode.h"
2828
#include "base/threading/asio_event_dispatcher.h"
29-
#include "base/threading/asio_thread.h"
29+
#include "base/threading/thread.h"
3030

3131
#include <asio/connect.hpp>
3232
#include <asio/read.hpp>
@@ -164,7 +164,7 @@ void TcpChannel::Handler::onKeepAliveTimeout(const std::error_code& error_code)
164164
//--------------------------------------------------------------------------------------------------
165165
TcpChannel::TcpChannel(QObject* parent)
166166
: NetworkChannel(parent),
167-
proxy_(new TcpChannelProxy(base::AsioThread::currentTaskRunner(), this)),
167+
proxy_(new TcpChannelProxy(base::Thread::currentTaskRunner(), this)),
168168
io_context_(base::AsioEventDispatcher::currentIoContext()),
169169
socket_(io_context_),
170170
resolver_(std::make_unique<asio::ip::tcp::resolver>(io_context_)),
@@ -178,7 +178,7 @@ TcpChannel::TcpChannel(QObject* parent)
178178
//--------------------------------------------------------------------------------------------------
179179
TcpChannel::TcpChannel(asio::ip::tcp::socket&& socket, QObject* parent)
180180
: NetworkChannel(parent),
181-
proxy_(new TcpChannelProxy(base::AsioThread::currentTaskRunner(), this)),
181+
proxy_(new TcpChannelProxy(base::Thread::currentTaskRunner(), this)),
182182
io_context_(base::AsioEventDispatcher::currentIoContext()),
183183
socket_(std::move(socket)),
184184
connected_(true),

‎source/base/threading/asio_thread.cc renamed to ‎source/base/threading/thread.cc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,40 @@
1616
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
//
1818

19-
#include "base/threading/asio_thread.h"
19+
#include "base/threading/thread.h"
2020

2121
#include "base/threading/asio_event_dispatcher.h"
2222
#include "base/threading/asio_task_runner.h"
2323
#include "base/application.h"
2424
#include "base/logging.h"
2525

26-
#if defined(Q_OS_WIN)
26+
#if defined(Q_OS_WINDOWS)
2727
#include "base/win/scoped_com_initializer.h"
28-
#endif // defined(Q_OS_WIN)
28+
#endif // defined(Q_OS_WINDOWS)
2929

3030
namespace base {
3131

3232
//--------------------------------------------------------------------------------------------------
33-
AsioThread::AsioThread(EventDispatcher event_dispatcher, Delegate* delegate, QObject* parent)
33+
Thread::Thread(EventDispatcher dispatcher, Delegate* delegate, QObject* parent)
3434
: QThread(parent),
3535
delegate_(delegate)
3636
{
37-
if (event_dispatcher == EventDispatcher::ASIO)
37+
if (dispatcher == AsioDispatcher)
3838
setEventDispatcher(new AsioEventDispatcher());
3939
}
4040

4141
//--------------------------------------------------------------------------------------------------
42-
void AsioThread::stop()
42+
void Thread::stop()
4343
{
4444
quit();
4545
wait();
4646
}
4747

4848
//--------------------------------------------------------------------------------------------------
4949
// static
50-
std::shared_ptr<TaskRunner> AsioThread::currentTaskRunner()
50+
std::shared_ptr<TaskRunner> Thread::currentTaskRunner()
5151
{
52-
AsioThread* thread = dynamic_cast<AsioThread*>(QThread::currentThread());
52+
Thread* thread = dynamic_cast<Thread*>(QThread::currentThread());
5353
if (thread)
5454
return thread->taskRunner();
5555

@@ -60,18 +60,20 @@ std::shared_ptr<TaskRunner> AsioThread::currentTaskRunner()
6060
}
6161

6262
//--------------------------------------------------------------------------------------------------
63-
std::shared_ptr<base::TaskRunner> AsioThread::taskRunner()
63+
std::shared_ptr<base::TaskRunner> Thread::taskRunner()
6464
{
6565
return task_runner_;
6666
}
6767

6868
//--------------------------------------------------------------------------------------------------
69-
void AsioThread::run()
69+
void Thread::run()
7070
{
7171
task_runner_ = std::make_shared<AsioTaskRunner>();
7272

73+
#if defined(Q_OS_WINDOWS)
7374
win::ScopedCOMInitializer com_initializer;
7475
CHECK(com_initializer.isSucceeded());
76+
#endif // defined(Q_OS_WINDOWS)
7577

7678
if (delegate_)
7779
delegate_->onBeforeThreadRunning();

‎source/base/threading/asio_thread.h renamed to ‎source/base/threading/thread.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
//
1818

19-
#ifndef BASE_THREADING_ASIO_THREAD_H
20-
#define BASE_THREADING_ASIO_THREAD_H
19+
#ifndef BASE_THREADING_THREAD_H
20+
#define BASE_THREADING_THREAD_H
2121

2222
#include "base/macros_magic.h"
2323
#include "base/task_runner.h"
@@ -26,10 +26,10 @@
2626

2727
namespace base {
2828

29-
class AsioThread final : public QThread
29+
class Thread final : public QThread
3030
{
3131
public:
32-
enum class EventDispatcher { ASIO, QT };
32+
enum EventDispatcher { AsioDispatcher, QtDispatcher };
3333

3434
class Delegate
3535
{
@@ -49,7 +49,7 @@ class AsioThread final : public QThread
4949
}
5050
};
5151

52-
AsioThread(EventDispatcher event_dispatcher, Delegate* delegate, QObject* parent = nullptr);
52+
Thread(EventDispatcher dispatcher, Delegate* delegate, QObject* parent = nullptr);
5353

5454
void stop();
5555

@@ -64,9 +64,9 @@ class AsioThread final : public QThread
6464
std::shared_ptr<TaskRunner> task_runner_;
6565
Delegate* delegate_ = nullptr;
6666

67-
DISALLOW_COPY_AND_ASSIGN(AsioThread);
67+
DISALLOW_COPY_AND_ASSIGN(Thread);
6868
};
6969

7070
} // namespace base
7171

72-
#endif // BASE_THREADING_ASIO_THREAD_H
72+
#endif // BASE_THREADING_THREAD_H

‎source/client/online_checker/online_checker.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace client {
2525

2626
//--------------------------------------------------------------------------------------------------
2727
OnlineChecker::OnlineChecker(std::shared_ptr<base::TaskRunner> ui_task_runner)
28-
: io_thread_(base::AsioThread::EventDispatcher::ASIO, this),
28+
: io_thread_(base::Thread::AsioDispatcher, this),
2929
ui_task_runner_(std::move(ui_task_runner))
3030
{
3131
LOG(LS_INFO) << "Ctor";

‎source/client/online_checker/online_checker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "base/macros_magic.h"
2323
#include "base/scoped_task_runner.h"
24-
#include "base/threading/asio_thread.h"
24+
#include "base/threading/thread.h"
2525
#include "client/online_checker/online_checker_direct.h"
2626
#include "client/online_checker/online_checker_router.h"
2727

@@ -33,7 +33,7 @@
3333
namespace client {
3434

3535
class OnlineChecker final
36-
: public base::AsioThread::Delegate,
36+
: public base::Thread::Delegate,
3737
public OnlineCheckerDirect::Delegate,
3838
public OnlineCheckerRouter::Delegate
3939
{
@@ -76,7 +76,7 @@ class OnlineChecker final
7676
void onRouterCheckerFinished() final;
7777

7878
private:
79-
base::AsioThread io_thread_;
79+
base::Thread io_thread_;
8080
std::shared_ptr<base::TaskRunner> io_task_runner_;
8181
base::ScopedTaskRunner ui_task_runner_;
8282

‎source/common/clipboard_monitor.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ namespace common {
3636
namespace {
3737

3838
#if defined(Q_OS_WIN)
39-
const base::AsioThread::EventDispatcher kEventDispatcher = base::AsioThread::EventDispatcher::QT;
39+
const base::Thread::EventDispatcher kEventDispatcher = base::Thread::QtDispatcher;
4040
#else
41-
const base::AsioThread::EventDispatcher kEventDispatcher = base::AsioThread::EventDispatcher::ASIO;
41+
const base::Thread::EventDispatcher kEventDispatcher = base::Thread::AsioDispatcher;
4242
#endif
4343

4444
} // namespace
4545

4646
//--------------------------------------------------------------------------------------------------
4747
ClipboardMonitor::ClipboardMonitor(QObject* parent)
4848
: QObject(parent),
49-
thread_(std::make_unique<base::AsioThread>(kEventDispatcher, this))
49+
thread_(std::make_unique<base::Thread>(kEventDispatcher, this))
5050
{
5151
LOG(LS_INFO) << "Ctor";
5252
}

0 commit comments

Comments
 (0)