Index: third_party/libjingle/overrides/talk/base/messagequeue.cc |
=================================================================== |
--- third_party/libjingle/overrides/talk/base/messagequeue.cc (revision 124023) |
+++ third_party/libjingle/overrides/talk/base/messagequeue.cc (working copy) |
@@ -34,11 +34,43 @@ |
#endif |
#include "talk/base/common.h" |
+#include "talk/base/event.h" |
#include "talk/base/logging.h" |
#include "talk/base/messagequeue.h" |
#include "talk/base/physicalsocketserver.h" |
+namespace { |
+//------------------------------------------------------------------ |
+// NullSocketServer |
+class NullSocketServer : public talk_base::SocketServer { |
+ public: |
+ NullSocketServer() : event_(false, false) {} |
+ |
+ virtual bool Wait(int cms, bool process_io) { |
+ return event_.Wait(talk_base::kForever); |
+ } |
+ |
+ virtual void WakeUp() { |
+ event_.Set(); |
+ } |
+ |
+ virtual talk_base::Socket* CreateSocket(int type) { |
+ return NULL; |
+ } |
+ |
+ // Returns a new socket for nonblocking communication. The type can be |
+ // SOCK_DGRAM and/or SOCK_STREAM. |
+ virtual talk_base::AsyncSocket* CreateAsyncSocket(int type) { |
+ return NULL; |
+ } |
+ |
+ private: |
+ talk_base::Event event_; |
+}; |
+ |
+} |
+ |
namespace talk_base { |
const uint32 kMaxMsgLatency = 150; // 150 ms |
@@ -105,18 +137,28 @@ |
//------------------------------------------------------------------ |
// MessageQueue |
-MessageQueue::MessageQueue(SocketServer* ss) |
- : ss_(ss), fStop_(false), fPeekKeep_(false), active_(false), |
- dmsgq_next_num_(0) { |
- if (!ss_) { |
- // Currently, MessageQueue holds a socket server, and is the base class for |
- // Thread. It seems like it makes more sense for Thread to hold the socket |
- // server, and provide it to the MessageQueue, since the Thread controls |
- // the I/O model, and MQ is agnostic to those details. Anyway, this causes |
- // messagequeue_unittest to depend on network libraries... yuck. |
- default_ss_.reset(new PhysicalSocketServer()); |
- ss_ = default_ss_.get(); |
- } |
+MessageQueue::MessageQueue() { |
+ // TODO(ronghuawu): |
+ // Currently, MessageQueue holds a socket server, and is the base class for |
+ // Thread. It seems like it makes more sense for Thread to hold the socket |
+ // server, and provide it to the MessageQueue, since the Thread controls |
+ // the I/O model, and MQ is agnostic to those details. Anyway, this causes |
+ // messagequeue_unittest to depend on network libraries... yuck. |
+ default_ss_.reset(new PhysicalSocketServer()); |
Sergey Ulanov
2012/02/29 00:09:52
please rename default_ss_ to owned_ss_ and set ss_
Ronghua Wu (Left Chromium)
2012/02/29 04:31:22
Done.
|
+ Construct(); |
+} |
+ |
+MessageQueue::MessageQueue(SocketServer* ss) { |
+ default_ss_.reset(ss ? ss : (new NullSocketServer())); |
Sergey Ulanov
2012/02/29 00:09:52
Does this mean we always own the socket server obj
Ronghua Wu (Left Chromium)
2012/02/29 04:31:22
Fixed, my mistake.
|
+ Construct(); |
+} |
+ |
+void MessageQueue::Construct() { |
+ fStop_ = false; |
+ fPeekKeep_ = false; |
+ active_ = false; |
+ dmsgq_next_num_ = 0; |
+ ss_ = default_ss_.get(); |
ss_->SetMessageQueue(this); |
} |