Remove use of ConditionVariableWrapper and CriticalSectionWrapper from UdpSocket2Windows.

webrtc/test/channel_transport/udp_socket2_win.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 32 matching lines @@
 UdpSocket2Windows::UdpSocket2Windows(const int32_t id,
                                      UdpSocketManager* mgr, bool ipV6Enable,
                                      bool disableGQOS)
     : _id(id),
       _qos(true),
       _iProtocol(0),
       _outstandingCalls(0),
       _outstandingCallComplete(0),
       _terminate(false),
       _addedToMgr(false),
+      delete_event_(true, false),
       _safeTodelete(false),
       _outstandingCallsDisabled(false),
       _clientHandle(NULL),
       _flowHandle(NULL),
       _filterHandle(NULL),
       _flow(NULL),
       _gtc(NULL),
       _pcp(-2),
       _receiveBuffers(0)
 {
     WEBRTC_TRACE(kTraceMemory, kTraceTransport, _id,
                  "UdpSocket2Windows::UdpSocket2Windows()");
 
     _wantsIncoming = false;
     _mgr = static_cast<UdpSocket2ManagerWindows *>(mgr);
 
     _obj = NULL;
     _incomingCb = NULL;
     _socket = INVALID_SOCKET;
-    _pCrit = CriticalSectionWrapper::CreateCriticalSection();
     _ptrCbRWLock     = RWLockWrapper::CreateRWLock();
     _ptrDestRWLock   = RWLockWrapper::CreateRWLock();
     _ptrSocketRWLock = RWLockWrapper::CreateRWLock();
-    _ptrDeleteCrit   = CriticalSectionWrapper::CreateCriticalSection();
-    _ptrDeleteCond   = ConditionVariableWrapper::CreateConditionVariable();
 
     // Check if QoS is supported.
     BOOL bProtocolFound = FALSE;
     WSAPROTOCOL_INFO *lpProtocolBuf = NULL;
     WSAPROTOCOL_INFO    pProtocolInfo;
 
     if(!disableGQOS)
     {
         DWORD dwBufLen = 0;
         // Set dwBufLen to the size needed to retreive all the requested
@@ skipping 93 matching lines @@
 }
 
 UdpSocket2Windows::~UdpSocket2Windows()
 {
     WEBRTC_TRACE(kTraceMemory, kTraceTransport, _id,
                  "UdpSocket2Windows::~UdpSocket2Windows()");
 
     WaitForOutstandingCalls();
 
     delete _ptrCbRWLock;
-    delete _ptrDeleteCrit;
-    delete _ptrDeleteCond;
     delete _ptrDestRWLock;
     delete _ptrSocketRWLock;
 
-    if(_pCrit)
-        delete _pCrit;
-
     if (_flow)
     {
         free(_flow);
         _flow = NULL;
     }
 
     if (_gtc)
     {
         if(_filterHandle)
         {
@@ skipping 1063 matching lines @@
         // disabled it is time to terminate.
         _terminate = true;
     }
     _ptrDestRWLock->ReleaseLockShared();
 
     if((--_outstandingCallComplete == 0) &&
         (_terminate))
     {
         // Only one thread will enter here. The thread with the last outstanding
         // call.
-        CriticalSectionScoped cs(_ptrDeleteCrit);
         _safeTodelete = true;
-        _ptrDeleteCond->Wake();
+        delete_event_.Set();
     }
 }
 
 void UdpSocket2Windows::DisableNewOutstandingCalls()
 {
     _ptrDestRWLock->AcquireLockExclusive();
     if(_outstandingCallsDisabled)
     {
         // Outstandning calls are already disabled.
         _ptrDestRWLock->ReleaseLockExclusive();
         return;
     }
     _outstandingCallsDisabled = true;
     const bool noOutstandingCalls = (_outstandingCalls.Value() == 0);
     _ptrDestRWLock->ReleaseLockExclusive();
 
     RemoveSocketFromManager();
 
     if(noOutstandingCalls)
     {
-        CriticalSectionScoped cs(_ptrDeleteCrit);
         _safeTodelete = true;
-        _ptrDeleteCond->Wake();
+        delete_event_.Set();
     }
 }
 
 void UdpSocket2Windows::WaitForOutstandingCalls()
 {
-    CriticalSectionScoped cs(_ptrDeleteCrit);
-    while(!_safeTodelete)
-    {
-        _ptrDeleteCond->SleepCS(*_ptrDeleteCrit);
-    }
+    if (!_safeTodelete)

[pbos-webrtc, 2016/01/19 20:36:51]

Racy read, this was protected by the critical section. Use atomics to set/get
this.

[pbos-webrtc, 2016/01/19 20:41:09]

OTOH, just remove this variable, the event is still set, you can Wait() for it
always.

[tommi, 2016/01/19 21:06:25]

Yes, will do.
This code is riddled with races though :-(  WaitForOutstandingCalls() is also an
enigma.  It's called just before 'delete this', the first thing in the dtor as
well and it's just two lines of code.  I'm not sure what the thought was behind
this.  Before, the code would enter a loop too even though the code that called
Wake(), would always set this variable.

+        delete_event_.Wait(rtc::Event::kForever);
 }
 
 void UdpSocket2Windows::RemoveSocketFromManager()
 {
     // New outstanding calls should be disabled at this point.
     assert(_outstandingCallsDisabled);
 
     if(_addedToMgr)
     {
         WEBRTC_TRACE(kTraceDebug, kTraceTransport, _id,
@@ skipping 37 matching lines @@
                      "UdpSocket2Windows(%d)::InvalidateSocket() WSAerror: %d",
                      (int32_t)this, WSAGetLastError());
     }
     _socket = INVALID_SOCKET;
     _ptrSocketRWLock->ReleaseLockExclusive();
     return true;
 }
 
 }  // namespace test
 }  // namespace webrtc