From 27c0be9dfe98dafd63673f3b22f55912bc2955ca Mon Sep 17 00:00:00 2001 From: "tommi@webrtc.org" Date: Thu, 19 Mar 2015 14:35:58 +0000 Subject: [PATCH] Remove ThreadObj #define and kThreadMaxNameLength from thread_wrapper. BUG= R=hbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/47679004 Cr-Commit-Position: refs/heads/master@{#8792} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8792 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/interface/thread_wrapper.h | 7 ------- webrtc/system_wrappers/source/event_posix.cc | 2 +- webrtc/system_wrappers/source/event_posix.h | 2 +- webrtc/system_wrappers/source/thread.cc | 2 +- webrtc/system_wrappers/source/thread_posix.cc | 4 ++-- webrtc/system_wrappers/source/thread_posix.h | 2 +- webrtc/system_wrappers/source/thread_win.cc | 2 +- webrtc/test/channel_transport/udp_socket2_manager_win.cc | 2 +- webrtc/test/channel_transport/udp_socket2_manager_win.h | 2 +- webrtc/test/channel_transport/udp_socket_manager_posix.cc | 2 +- webrtc/test/channel_transport/udp_socket_manager_posix.h | 2 +- 11 files changed, 11 insertions(+), 18 deletions(-) diff --git a/webrtc/system_wrappers/interface/thread_wrapper.h b/webrtc/system_wrappers/interface/thread_wrapper.h index af1405d45e..856a1c3e34 100644 --- a/webrtc/system_wrappers/interface/thread_wrapper.h +++ b/webrtc/system_wrappers/interface/thread_wrapper.h @@ -21,11 +21,6 @@ namespace webrtc { -// Object that will be passed by the spawned thread when it enters the callback -// function. -// TODO(tommi): Remove this define. -#define ThreadObj void* - // Callback function that the spawned thread will enter once spawned. // A return value of false is interpreted as that the function has no // more work to do and that the thread can be released. @@ -44,8 +39,6 @@ enum ThreadPriority { // called from the same thread, including instantiation. class ThreadWrapper { public: - enum {kThreadMaxNameLength = 64}; - virtual ~ThreadWrapper() {} // Factory method. Constructor disabled. diff --git a/webrtc/system_wrappers/source/event_posix.cc b/webrtc/system_wrappers/source/event_posix.cc index d1331500b9..7cc5b21674 100644 --- a/webrtc/system_wrappers/source/event_posix.cc +++ b/webrtc/system_wrappers/source/event_posix.cc @@ -164,7 +164,7 @@ bool EventPosix::StartTimer(bool periodic, unsigned long time) { return started; } -bool EventPosix::Run(ThreadObj obj) { +bool EventPosix::Run(void* obj) { return static_cast(obj)->Process(); } diff --git a/webrtc/system_wrappers/source/event_posix.h b/webrtc/system_wrappers/source/event_posix.h index 0a3fc7ba7e..49c2da0450 100644 --- a/webrtc/system_wrappers/source/event_posix.h +++ b/webrtc/system_wrappers/source/event_posix.h @@ -40,7 +40,7 @@ class EventPosix : public EventWrapper { private: EventPosix(); - static bool Run(ThreadObj obj); + static bool Run(void* obj); bool Process(); EventTypeWrapper Wait(timespec* end_at); diff --git a/webrtc/system_wrappers/source/thread.cc b/webrtc/system_wrappers/source/thread.cc index 8d3fb40833..1dcf8f3794 100644 --- a/webrtc/system_wrappers/source/thread.cc +++ b/webrtc/system_wrappers/source/thread.cc @@ -19,7 +19,7 @@ namespace webrtc { ThreadWrapper* ThreadWrapper::CreateThread(ThreadRunFunction func, - ThreadObj obj, ThreadPriority prio, + void* obj, ThreadPriority prio, const char* thread_name) { #if defined(_WIN32) return new ThreadWindows(func, obj, prio, thread_name); diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc index bbf3b982e7..c60541175f 100644 --- a/webrtc/system_wrappers/source/thread_posix.cc +++ b/webrtc/system_wrappers/source/thread_posix.cc @@ -68,7 +68,7 @@ void* ThreadPosix::StartThread(void* param) { return 0; } -ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj, +ThreadPosix::ThreadPosix(ThreadRunFunction func, void* obj, ThreadPriority prio, const char* thread_name) : run_function_(func), obj_(obj), @@ -76,7 +76,7 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj, stop_event_(false, false), name_(thread_name ? thread_name : "webrtc"), thread_(0) { - DCHECK(name_.length() < kThreadMaxNameLength); + DCHECK(name_.length() < 64); } uint32_t ThreadWrapper::GetThreadId() { diff --git a/webrtc/system_wrappers/source/thread_posix.h b/webrtc/system_wrappers/source/thread_posix.h index 746984ffbf..ccc52b642a 100644 --- a/webrtc/system_wrappers/source/thread_posix.h +++ b/webrtc/system_wrappers/source/thread_posix.h @@ -25,7 +25,7 @@ int ConvertToSystemPriority(ThreadPriority priority, int min_prio, class ThreadPosix : public ThreadWrapper { public: - ThreadPosix(ThreadRunFunction func, ThreadObj obj, ThreadPriority prio, + ThreadPosix(ThreadRunFunction func, void* obj, ThreadPriority prio, const char* thread_name); ~ThreadPosix() override; diff --git a/webrtc/system_wrappers/source/thread_win.cc b/webrtc/system_wrappers/source/thread_win.cc index 716434ae7b..0c1a8f209e 100644 --- a/webrtc/system_wrappers/source/thread_win.cc +++ b/webrtc/system_wrappers/source/thread_win.cc @@ -54,7 +54,7 @@ void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName) { } -ThreadWindows::ThreadWindows(ThreadRunFunction func, ThreadObj obj, +ThreadWindows::ThreadWindows(ThreadRunFunction func, void* obj, ThreadPriority prio, const char* thread_name) : run_function_(func), obj_(obj), diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.cc b/webrtc/test/channel_transport/udp_socket2_manager_win.cc index a7ac516685..6dd5bd26d8 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.cc +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.cc @@ -574,7 +574,7 @@ int32_t UdpSocket2WorkerWindows::Init() return 0; } -bool UdpSocket2WorkerWindows::Run(ThreadObj obj) +bool UdpSocket2WorkerWindows::Run(void* obj) { UdpSocket2WorkerWindows* pWorker = static_cast(obj); diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h index b00633133e..f9bd51079e 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.h +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.h @@ -101,7 +101,7 @@ public: virtual bool Stop(); virtual int32_t Init(); protected: - static bool Run(ThreadObj obj); + static bool Run(void* obj); bool Process(); private: HANDLE _ioCompletionHandle; diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.cc b/webrtc/test/channel_transport/udp_socket_manager_posix.cc index 22bdfb0973..3c34814c18 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.cc @@ -300,7 +300,7 @@ bool UdpSocketManagerPosixImpl::Process() return true; } -bool UdpSocketManagerPosixImpl::Run(ThreadObj obj) +bool UdpSocketManagerPosixImpl::Run(void* obj) { UdpSocketManagerPosixImpl* mgr = static_cast(obj); diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.h b/webrtc/test/channel_transport/udp_socket_manager_posix.h index f41de2fc8e..e660c68188 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_posix.h +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.h @@ -68,7 +68,7 @@ public: virtual bool RemoveSocket(UdpSocketWrapper* s); protected: - static bool Run(ThreadObj obj); + static bool Run(void* obj); bool Process(); void UpdateSocketMap();