Fix DTLS packet boundary handling in SSLStreamAdapterTests.

webrtc/base/bufferqueue.h

 /*
  *  Copyright 2015 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.
  */
 
 #ifndef WEBRTC_BASE_BUFFERQUEUE_H_
 #define WEBRTC_BASE_BUFFERQUEUE_H_
 
 #include <deque>
 #include <vector>
 
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 
-class BufferQueue {
+// BufferEvents are used to asynchronously signal state transitionss.  The flags
+// may be combined.
+//  BQ_READ: Data is available
+//  BQ_WRITE: Data can be written
+enum BufferEvent { BQ_READ = 1, BQ_WRITE = 2 };
+
+struct BufferEventData : public MessageData {
+  int events;

[tommi, 2015/11/13 08:38:12]

for consistency keep members below methods

+  BufferEventData(int ev) : events(ev) { }
+};
+
+class BufferQueue : public MessageHandler {
  public:
+  enum {
+    MSG_POST_EVENT = 0x1

[tommi, 2015/11/13 08:38:12]

private?

+  };
+
   // Creates a buffer queue queue with a given capacity and default buffer size.
   BufferQueue(size_t capacity, size_t default_size);
+  // Creates a buffer queue queue with a given capacity, default buffer size
+  // and owner.
+  BufferQueue(size_t capacity, size_t default_size, Thread* owner);
   ~BufferQueue();
 
   // Return number of queued buffers.
   size_t size() const;
 
   // ReadFront will only read one buffer at a time and will truncate buffers
   // that don't fit in the passed memory.
   bool ReadFront(void* data, size_t bytes, size_t* bytes_read);
 
   // WriteBack always writes either the complete memory or nothing.
   bool WriteBack(const void* data, size_t bytes, size_t* bytes_written);
 
+  // BufferQueues may signal one or more BufferEvents to indicate state changes.
+  // The first argument identifies the buffer on which the state change occured.
+  // The second argument is a bit-wise combination of BufferEvents.
+  sigslot::signal2<BufferQueue*, int> SignalEvent;

[tommi, 2015/11/13 08:38:12]

can we use rtc::Bind instead?
If not, can we make this member variable private?

+
+  // Like calling SignalEvent, but posts a message to the specified thread,
+  // which will call SignalEvent.  This helps unroll the stack and prevent
+  // re-entrancy.
+  void PostEvent(Thread* t, int events);

[tommi, 2015/11/13 08:38:12]

nit: t -> thread

Should this be private?

+  // Like the aforementioned method, but posts to the current thread.
+  void PostEvent(int events);
+
+ protected:
+  // MessageHandler Interface
+  void OnMessage(Message* msg) override;
+
  private:
   size_t capacity_;
   size_t default_size_;
+  Thread* owner_;

[tommi, 2015/11/13 08:38:12]

if the value of this never changes, lets make it Thread* const owner_;
What about calling it owning_thread_, main_thread_ or ctor_thread_ instead of
owner_?

[joachim, 2015/11/16 21:30:15]

Renamed, but can't change to "const" ("PostEvent" needs a non-const Thread).

   std::deque<Buffer*> queue_;
   std::vector<Buffer*> free_list_;
   mutable CriticalSection crit_;  // object lock
 
   RTC_DISALLOW_COPY_AND_ASSIGN(BufferQueue);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_BUFFERQUEUE_H_