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
diff --git a/webrtc/system_wrappers/interface/thread_wrapper.h b/webrtc/system_wrappers/interface/thread_wrapper.h
index af1405d..856a1c3 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 @@
// 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 d133150..7cc5b21 100644
--- a/webrtc/system_wrappers/source/event_posix.cc
+++ b/webrtc/system_wrappers/source/event_posix.cc
@@ -164,7 +164,7 @@
return started;
}
-bool EventPosix::Run(ThreadObj obj) {
+bool EventPosix::Run(void* obj) {
return static_cast<EventPosix*>(obj)->Process();
}
diff --git a/webrtc/system_wrappers/source/event_posix.h b/webrtc/system_wrappers/source/event_posix.h
index 0a3fc7b..49c2da0 100644
--- a/webrtc/system_wrappers/source/event_posix.h
+++ b/webrtc/system_wrappers/source/event_posix.h
@@ -40,7 +40,7 @@
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 8d3fb40..1dcf8f3 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 bbf3b98..c605411 100644
--- a/webrtc/system_wrappers/source/thread_posix.cc
+++ b/webrtc/system_wrappers/source/thread_posix.cc
@@ -68,7 +68,7 @@
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 @@
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 746984f..ccc52b6 100644
--- a/webrtc/system_wrappers/source/thread_posix.h
+++ b/webrtc/system_wrappers/source/thread_posix.h
@@ -25,7 +25,7 @@
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 716434a..0c1a8f2 100644
--- a/webrtc/system_wrappers/source/thread_win.cc
+++ b/webrtc/system_wrappers/source/thread_win.cc
@@ -54,7 +54,7 @@
}
-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 a7ac516..6dd5bd2 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 @@
return 0;
}
-bool UdpSocket2WorkerWindows::Run(ThreadObj obj)
+bool UdpSocket2WorkerWindows::Run(void* obj)
{
UdpSocket2WorkerWindows* pWorker =
static_cast<UdpSocket2WorkerWindows*>(obj);
diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h
index b006331..f9bd510 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 @@
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 22bdfb0..3c34814 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 @@
return true;
}
-bool UdpSocketManagerPosixImpl::Run(ThreadObj obj)
+bool UdpSocketManagerPosixImpl::Run(void* obj)
{
UdpSocketManagerPosixImpl* mgr =
static_cast<UdpSocketManagerPosixImpl*>(obj);
diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.h b/webrtc/test/channel_transport/udp_socket_manager_posix.h
index f41de2f..e660c68 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 @@
virtual bool RemoveSocket(UdpSocketWrapper* s);
protected:
- static bool Run(ThreadObj obj);
+ static bool Run(void* obj);
bool Process();
void UpdateSocketMap();
