Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread.

third_party/libjingle/overrides/talk/base/messagequeue.cc

 /*
  * libjingle
  * Copyright 2004--2005, Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 16 matching lines @@
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 #pragma warning(disable:4786)
 #endif
 
 #ifdef POSIX
 #include <sys/time.h>
 #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_;
+};
+
+}

[Sergey Ulanov, 2012/02/29 05:30:31]

nit: // namespace

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

 
 namespace talk_base {
 
 const uint32 kMaxMsgLatency = 150;  // 150 ms
 
 //------------------------------------------------------------------
 // MessageQueueManager
 
 MessageQueueManager* MessageQueueManager::instance_;
 
@@ skipping 47 matching lines @@
   ASSERT(!crit_.CurrentThreadIsOwner());  // See note above.
   CritScope cs(&crit_);
   std::vector<MessageQueue *>::iterator iter;
   for (iter = message_queues_.begin(); iter != message_queues_.end(); iter++)
     (*iter)->Clear(handler);
 }
 
 //------------------------------------------------------------------
 // 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.
+  owned_ss_.reset(new PhysicalSocketServer());
+  ss_ = owned_ss_.get();
+  Construct();
+}
+
+MessageQueue::MessageQueue(SocketServer* ss) {
+  if (ss) {
+    ss_ = ss;
+  } else {
+    owned_ss_.reset(new NullSocketServer());
+    ss_ = owned_ss_.get();
   }
+  Construct();
+}
+
+void MessageQueue::Construct() {
+  fStop_ = false;
+  fPeekKeep_ = false;
+  active_ = false;
+  dmsgq_next_num_ = 0;
   ss_->SetMessageQueue(this);
 }
 
 MessageQueue::~MessageQueue() {
   // The signal is done from here to ensure
   // that it always gets called when the queue
   // is going away.
   SignalQueueDestroyed();
   if (active_) {
     MessageQueueManager::Instance()->Remove(this);
     Clear(NULL);
   }
   if (ss_) {
     ss_->SetMessageQueue(NULL);
   }
 }
 
 void MessageQueue::set_socketserver(SocketServer* ss) {
-  ss_ = ss ? ss : default_ss_.get();
+  ss_ = ss ? ss : owned_ss_.get();
   ss_->SetMessageQueue(this);
 }
 
 void MessageQueue::Quit() {
   fStop_ = true;
   ss_->WakeUp();
 }
 
 bool MessageQueue::IsQuitting() {
   return fStop_;
@@ skipping 225 matching lines @@
 
 void MessageQueue::EnsureActive() {
   ASSERT(crit_.CurrentThreadIsOwner());
   if (!active_) {
     active_ = true;
     MessageQueueManager::Instance()->Add(this);
   }
 }
 
 }  // namespace talk_base