Rename AsioThread to Thread.

Author: dchapyshev

source/base/CMakeLists.txt

@@ -624,10 +624,10 @@ list(APPEND SOURCE_BASE_THREADING
     threading/asio_event_dispatcher.h
     threading/asio_task_runner.cc
     threading/asio_task_runner.h
-    threading/asio_thread.cc
-    threading/asio_thread.h
     threading/simple_thread.cc
     threading/simple_thread.h
+    threading/thread.cc
+    threading/thread.h
     threading/thread_checker.cc
     threading/thread_checker.h)
 

source/base/audio/audio_capturer_wrapper.cc

@@ -28,7 +28,7 @@ namespace base {
 //--------------------------------------------------------------------------------------------------
 AudioCapturerWrapper::AudioCapturerWrapper(std::shared_ptr<IpcChannelProxy> channel_proxy)
     : channel_proxy_(std::move(channel_proxy)),
-      thread_(std::make_unique<AsioThread>(AsioThread::EventDispatcher::ASIO, this))
+      thread_(std::make_unique<Thread>(Thread::AsioDispatcher, this))
 {
     LOG(LS_INFO) << "Ctor";
     DCHECK(channel_proxy_);
@@ -53,7 +53,7 @@ void AudioCapturerWrapper::start()
 //--------------------------------------------------------------------------------------------------
 void AudioCapturerWrapper::onBeforeThreadRunning()
 {
-    thread_->setPriority(AsioThread::HighestPriority);
+    thread_->setPriority(Thread::HighestPriority);
 
     capturer_ = AudioCapturer::create();
     if (!capturer_)

source/base/audio/audio_capturer_wrapper.h

@@ -19,15 +19,15 @@
 #ifndef BASE_AUDIO_AUDIO_CAPTURER_WRAPPER_H
 #define BASE_AUDIO_AUDIO_CAPTURER_WRAPPER_H
 
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 #include "proto/desktop_internal.pb.h"
 
 namespace base {
 
 class AudioCapturer;
 class IpcChannelProxy;
 
-class AudioCapturerWrapper final : public AsioThread::Delegate
+class AudioCapturerWrapper final : public Thread::Delegate
 {
 public:
     explicit AudioCapturerWrapper(std::shared_ptr<IpcChannelProxy> channel_proxy);
@@ -42,7 +42,7 @@ class AudioCapturerWrapper final : public AsioThread::Delegate
 
 private:
     std::shared_ptr<IpcChannelProxy> channel_proxy_;
-    std::unique_ptr<AsioThread> thread_;
+    std::unique_ptr<Thread> thread_;
     std::unique_ptr<AudioCapturer> capturer_;
     proto::internal::DesktopToService outgoing_message_;
 

source/base/ipc/ipc_channel.cc

@@ -23,7 +23,7 @@
 #include "base/ipc/ipc_channel_proxy.h"
 #include "base/strings/unicode.h"
 #include "base/threading/asio_event_dispatcher.h"
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 
 #include <asio/read.hpp>
 #include <asio/write.hpp>
@@ -176,7 +176,7 @@ void IpcChannel::Handler::onReadData(const std::error_code& error_code, size_t b
 IpcChannel::IpcChannel(QObject* parent)
     : QObject(parent),
       stream_(AsioEventDispatcher::currentIoContext()),
-      proxy_(new IpcChannelProxy(AsioThread::currentTaskRunner(), this)),
+      proxy_(new IpcChannelProxy(Thread::currentTaskRunner(), this)),
       handler_(base::make_local_shared<Handler>(this))
 {
     LOG(LS_INFO) << "Ctor";
@@ -187,7 +187,7 @@ IpcChannel::IpcChannel(const QString& channel_name, Stream&& stream, QObject* pa
     : QObject(parent),
       channel_name_(channel_name),
       stream_(std::move(stream)),
-      proxy_(new IpcChannelProxy(AsioThread::currentTaskRunner(), this)),
+      proxy_(new IpcChannelProxy(Thread::currentTaskRunner(), this)),
       is_connected_(true),
       handler_(base::make_local_shared<Handler>(this))
 {

source/base/net/tcp_channel.cc

@@ -26,7 +26,7 @@
 #include "base/net/tcp_channel_proxy.h"
 #include "base/strings/unicode.h"
 #include "base/threading/asio_event_dispatcher.h"
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 
 #include <asio/connect.hpp>
 #include <asio/read.hpp>
@@ -164,7 +164,7 @@ void TcpChannel::Handler::onKeepAliveTimeout(const std::error_code& error_code)
 //--------------------------------------------------------------------------------------------------
 TcpChannel::TcpChannel(QObject* parent)
     : NetworkChannel(parent),
-      proxy_(new TcpChannelProxy(base::AsioThread::currentTaskRunner(), this)),
+      proxy_(new TcpChannelProxy(base::Thread::currentTaskRunner(), this)),
       io_context_(base::AsioEventDispatcher::currentIoContext()),
       socket_(io_context_),
       resolver_(std::make_unique<asio::ip::tcp::resolver>(io_context_)),
@@ -178,7 +178,7 @@ TcpChannel::TcpChannel(QObject* parent)
 //--------------------------------------------------------------------------------------------------
 TcpChannel::TcpChannel(asio::ip::tcp::socket&& socket, QObject* parent)
     : NetworkChannel(parent),
-      proxy_(new TcpChannelProxy(base::AsioThread::currentTaskRunner(), this)),
+      proxy_(new TcpChannelProxy(base::Thread::currentTaskRunner(), this)),
       io_context_(base::AsioEventDispatcher::currentIoContext()),
       socket_(std::move(socket)),
       connected_(true),

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

@@ -16,40 +16,40 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 
 #include "base/threading/asio_event_dispatcher.h"
 #include "base/threading/asio_task_runner.h"
 #include "base/application.h"
 #include "base/logging.h"
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINDOWS)
 #include "base/win/scoped_com_initializer.h"
-#endif // defined(Q_OS_WIN)
+#endif // defined(Q_OS_WINDOWS)
 
 namespace base {
 
 //--------------------------------------------------------------------------------------------------
-AsioThread::AsioThread(EventDispatcher event_dispatcher, Delegate* delegate, QObject* parent)
+Thread::Thread(EventDispatcher dispatcher, Delegate* delegate, QObject* parent)
     : QThread(parent),
       delegate_(delegate)
 {
-    if (event_dispatcher == EventDispatcher::ASIO)
+    if (dispatcher == AsioDispatcher)
         setEventDispatcher(new AsioEventDispatcher());
 }
 
 //--------------------------------------------------------------------------------------------------
-void AsioThread::stop()
+void Thread::stop()
 {
     quit();
     wait();
 }
 
 //--------------------------------------------------------------------------------------------------
 // static
-std::shared_ptr<TaskRunner> AsioThread::currentTaskRunner()
+std::shared_ptr<TaskRunner> Thread::currentTaskRunner()
 {
-    AsioThread* thread = dynamic_cast<AsioThread*>(QThread::currentThread());
+    Thread* thread = dynamic_cast<Thread*>(QThread::currentThread());
     if (thread)
         return thread->taskRunner();
 
@@ -60,18 +60,20 @@ std::shared_ptr<TaskRunner> AsioThread::currentTaskRunner()
 }
 
 //--------------------------------------------------------------------------------------------------
-std::shared_ptr<base::TaskRunner> AsioThread::taskRunner()
+std::shared_ptr<base::TaskRunner> Thread::taskRunner()
 {
     return task_runner_;
 }
 
 //--------------------------------------------------------------------------------------------------
-void AsioThread::run()
+void Thread::run()
 {
     task_runner_ = std::make_shared<AsioTaskRunner>();
 
+#if defined(Q_OS_WINDOWS)
     win::ScopedCOMInitializer com_initializer;
     CHECK(com_initializer.isSucceeded());
+#endif // defined(Q_OS_WINDOWS)
 
     if (delegate_)
         delegate_->onBeforeThreadRunning();

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

@@ -16,8 +16,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#ifndef BASE_THREADING_ASIO_THREAD_H
-#define BASE_THREADING_ASIO_THREAD_H
+#ifndef BASE_THREADING_THREAD_H
+#define BASE_THREADING_THREAD_H
 
 #include "base/macros_magic.h"
 #include "base/task_runner.h"
@@ -26,10 +26,10 @@
 
 namespace base {
 
-class AsioThread final : public QThread
+class Thread final : public QThread
 {
 public:
-    enum class EventDispatcher { ASIO, QT };
+    enum EventDispatcher { AsioDispatcher, QtDispatcher };
 
     class Delegate
     {
@@ -49,7 +49,7 @@ class AsioThread final : public QThread
         }
     };
 
-    AsioThread(EventDispatcher event_dispatcher, Delegate* delegate, QObject* parent = nullptr);
+    Thread(EventDispatcher dispatcher, Delegate* delegate, QObject* parent = nullptr);
 
     void stop();
 
@@ -64,9 +64,9 @@ class AsioThread final : public QThread
     std::shared_ptr<TaskRunner> task_runner_;
     Delegate* delegate_ = nullptr;
 
-    DISALLOW_COPY_AND_ASSIGN(AsioThread);
+    DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 } // namespace base
 
-#endif // BASE_THREADING_ASIO_THREAD_H
+#endif // BASE_THREADING_THREAD_H

source/client/online_checker/online_checker.cc

@@ -25,7 +25,7 @@ namespace client {
 
 //--------------------------------------------------------------------------------------------------
 OnlineChecker::OnlineChecker(std::shared_ptr<base::TaskRunner> ui_task_runner)
-    : io_thread_(base::AsioThread::EventDispatcher::ASIO, this),
+    : io_thread_(base::Thread::AsioDispatcher, this),
       ui_task_runner_(std::move(ui_task_runner))
 {
     LOG(LS_INFO) << "Ctor";

source/client/online_checker/online_checker.h

@@ -21,7 +21,7 @@
 
 #include "base/macros_magic.h"
 #include "base/scoped_task_runner.h"
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 #include "client/online_checker/online_checker_direct.h"
 #include "client/online_checker/online_checker_router.h"
 
@@ -33,7 +33,7 @@
 namespace client {
 
 class OnlineChecker final
-    : public base::AsioThread::Delegate,
+    : public base::Thread::Delegate,
       public OnlineCheckerDirect::Delegate,
       public OnlineCheckerRouter::Delegate
 {
@@ -76,7 +76,7 @@ class OnlineChecker final
     void onRouterCheckerFinished() final;
 
 private:
-    base::AsioThread io_thread_;
+    base::Thread io_thread_;
     std::shared_ptr<base::TaskRunner> io_task_runner_;
     base::ScopedTaskRunner ui_task_runner_;
 

source/common/clipboard_monitor.cc

@@ -36,17 +36,17 @@ namespace common {
 namespace {
 
 #if defined(Q_OS_WIN)
-const base::AsioThread::EventDispatcher kEventDispatcher = base::AsioThread::EventDispatcher::QT;
+const base::Thread::EventDispatcher kEventDispatcher = base::Thread::QtDispatcher;
 #else
-const base::AsioThread::EventDispatcher kEventDispatcher = base::AsioThread::EventDispatcher::ASIO;
+const base::Thread::EventDispatcher kEventDispatcher = base::Thread::AsioDispatcher;
 #endif
 
 } // namespace
 
 //--------------------------------------------------------------------------------------------------
 ClipboardMonitor::ClipboardMonitor(QObject* parent)
     : QObject(parent),
-      thread_(std::make_unique<base::AsioThread>(kEventDispatcher, this))
+      thread_(std::make_unique<base::Thread>(kEventDispatcher, this))
 {
     LOG(LS_INFO) << "Ctor";
 }

source/common/clipboard_monitor.h

@@ -19,14 +19,14 @@
 #ifndef COMMON_CLIPBOARD_MONITOR_H
 #define COMMON_CLIPBOARD_MONITOR_H
 
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 #include "common/clipboard.h"
 
 namespace common {
 
 class ClipboardMonitor final
     : public QObject,
-      public base::AsioThread::Delegate
+      public base::Thread::Delegate
 {
     Q_OBJECT
 
@@ -50,7 +50,7 @@ class ClipboardMonitor final
     void onAfterThreadRunning() final;
 
 private:
-    std::unique_ptr<base::AsioThread> thread_;
+    std::unique_ptr<base::Thread> thread_;
     std::unique_ptr<common::Clipboard> clipboard_;
 
     DISALLOW_COPY_AND_ASSIGN(ClipboardMonitor);

source/host/desktop_session_agent.cc

@@ -72,7 +72,7 @@ const char* controlActionToString(proto::internal::DesktopControl::Action action
 //--------------------------------------------------------------------------------------------------
 DesktopSessionAgent::DesktopSessionAgent(QObject* parent)
     : QObject(parent),
-      ui_thread_(base::AsioThread::EventDispatcher::QT, this),
+      ui_thread_(base::Thread::QtDispatcher, this),
       screen_capture_timer_(new QTimer(this)),
       incoming_message_(std::make_unique<proto::internal::ServiceToDesktop>()),
       outgoing_message_(std::make_unique<proto::internal::DesktopToService>())

source/host/desktop_session_agent.h

@@ -23,7 +23,7 @@
 #include "base/desktop/screen_capturer_wrapper.h"
 #include "base/ipc/ipc_channel.h"
 #include "base/ipc/shared_memory_factory.h"
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 #include "common/clipboard_monitor.h"
 #include "proto/desktop_internal.pb.h"
 
@@ -55,7 +55,7 @@ class DesktopSessionAgent final
       public base::IpcChannel::Listener,
       public base::SharedMemoryFactory::Delegate,
       public base::ScreenCapturerWrapper::Delegate,
-      public base::AsioThread::Delegate
+      public base::Thread::Delegate
 {
     Q_OBJECT
 
@@ -103,7 +103,7 @@ private slots:
     bool is_session_enabled_ = false;
 
 #if defined(OS_WIN)
-    base::AsioThread ui_thread_;
+    base::Thread ui_thread_;
     std::unique_ptr<base::win::MessageWindow> message_window_;
 #endif // defined(OS_WIN)
 

source/qt_base/application.cc

@@ -111,7 +111,7 @@ bool isSameApplication(const QLocalSocket* socket)
 //--------------------------------------------------------------------------------------------------
 Application::Application(int& argc, char* argv[])
     : QApplication(argc, argv),
-      io_thread_(base::AsioThread::EventDispatcher::ASIO, nullptr)
+      io_thread_(base::Thread::AsioDispatcher, nullptr)
 {
     LOG(LS_INFO) << "Ctor";
 

source/qt_base/application.h

@@ -19,7 +19,7 @@
 #ifndef QT_BASE_APPLICATION_H
 #define QT_BASE_APPLICATION_H
 
-#include "base/threading/asio_thread.h"
+#include "base/threading/thread.h"
 #include "qt_base/locale_loader.h"
 
 #include <QApplication>
@@ -71,7 +71,7 @@ private slots:
     QLockFile* lock_file_ = nullptr;
     QLocalServer* server_ = nullptr;
 
-    base::AsioThread io_thread_;
+    base::Thread io_thread_;
     std::unique_ptr<base::ScopedCryptoInitializer> crypto_initializer_;
     std::unique_ptr<LocaleLoader> locale_loader_;
     std::shared_ptr<base::TaskRunner> ui_task_runner_;

source/relay/sessions_worker.cc

@@ -36,7 +36,7 @@ SessionsWorker::SessionsWorker(const QString& listen_interface,
       statistics_enabled_(statistics_enabled),
       statistics_interval_(statistics_interval),
       shared_pool_(std::move(shared_pool)),
-      thread_(std::make_unique<base::AsioThread>(base::AsioThread::EventDispatcher::ASIO, this))
+      thread_(std::make_unique<base::Thread>(base::Thread::AsioDispatcher, this))
 {
     LOG(LS_INFO) << "Ctor";
     DCHECK(peer_port_ && shared_pool_);