Merge pull request #126 from Cristinag/complete_flags

Remove unnecessary COMPLETE flag checks in Responders

Author: lehecka

CMakeLists.txt

@@ -92,11 +92,9 @@ add_library(
   src/automata/StreamSubscriptionResponderBase.h
   src/automata/StreamRequester.cpp
   src/automata/StreamRequester.h
-  src/automata/StreamResponder.cpp
   src/automata/StreamResponder.h
   src/automata/SubscriptionRequester.cpp
   src/automata/SubscriptionRequester.h
-  src/automata/SubscriptionResponder.cpp
   src/automata/SubscriptionResponder.h
   src/ConnectionAutomaton.cpp
   src/ConnectionAutomaton.h

TARGETS

@@ -43,9 +43,7 @@ cxx_library(
         'src/automata/StreamSubscriptionRequesterBase.cpp',
         'src/automata/StreamSubscriptionResponderBase.cpp',
         'src/automata/StreamRequester.cpp',
-        'src/automata/StreamResponder.cpp',
         'src/automata/SubscriptionRequester.cpp',
-        'src/automata/SubscriptionResponder.cpp',
         'src/ConnectionAutomaton.cpp',
         'src/Frame.cpp',
         'src/NullRequestHandler.cpp',

src/automata/StreamResponder.cpp

@@ -4,27 +4,15 @@
 
 #include <iosfwd>
 
-#include "reactive-streams/utilities/AllowanceSemaphore.h"
-#include "reactive-streams/utilities/SmartPointers.h"
-#include "src/AbstractStreamAutomaton.h"
-#include "src/Frame.h"
-#include "src/Payload.h"
-#include "src/ReactiveStreamsCompat.h"
 #include "src/automata/StreamSubscriptionResponderBase.h"
 #include "src/mixins/ExecutorMixin.h"
 #include "src/mixins/LoggingMixin.h"
 #include "src/mixins/MemoryMixin.h"
 #include "src/mixins/SinkIfMixin.h"
 #include "src/mixins/StreamIfMixin.h"
 
-namespace folly {
-class exception_wrapper;
-}
-
 namespace reactivesocket {
 
-enum class StreamCompletionSignal;
-
 /// Implementation of stream automaton that represents a Stream responder
 class StreamResponderBase : public StreamSubscriptionResponderBase {
   using Base = StreamSubscriptionResponderBase;
@@ -33,15 +21,10 @@ class StreamResponderBase : public StreamSubscriptionResponderBase {
   using Base::Base;
 
  protected:
-  /// @{
-
-  /// Not all frames are intercepted, some just pass through.
-  using Base::onNextFrame;
-
-  void onNextFrame(Frame_REQUEST_STREAM&&);
-
-  std::ostream& logPrefix(std::ostream& os);
-  /// @}
+  std::ostream& logPrefix(std::ostream& os) {
+    return os << "StreamResponder(" << &connection_ << ", " << streamId_
+              << "): ";
+  }
 };
 
 using StreamResponder = SinkIfMixin<StreamIfMixin<LoggingMixin<ExecutorMixin<

src/automata/StreamResponder.h

@@ -4,27 +4,15 @@
 
 #include <iosfwd>
 
-#include "reactive-streams/utilities/AllowanceSemaphore.h"
-#include "reactive-streams/utilities/SmartPointers.h"
-#include "src/AbstractStreamAutomaton.h"
-#include "src/Frame.h"
-#include "src/Payload.h"
-#include "src/ReactiveStreamsCompat.h"
 #include "src/automata/StreamSubscriptionResponderBase.h"
 #include "src/mixins/ExecutorMixin.h"
 #include "src/mixins/LoggingMixin.h"
 #include "src/mixins/MemoryMixin.h"
 #include "src/mixins/SinkIfMixin.h"
 #include "src/mixins/StreamIfMixin.h"
 
-namespace folly {
-class exception_wrapper;
-}
-
 namespace reactivesocket {
 
-enum class StreamCompletionSignal;
-
 /// Implementation of stream automaton that represents a Subscription responder.
 class SubscriptionResponderBase : public StreamSubscriptionResponderBase {
   using Base = StreamSubscriptionResponderBase;
@@ -33,14 +21,10 @@ class SubscriptionResponderBase : public StreamSubscriptionResponderBase {
   using Base::Base;
 
  protected:
-  /// @{
-  /// Not all frames are intercepted, some just pass through.
-  using Base::onNextFrame;
-
-  void onNextFrame(Frame_REQUEST_SUB&&);
-
-  std::ostream& logPrefix(std::ostream& os);
-  /// @}
+  std::ostream& logPrefix(std::ostream& os) {
+    return os << "SubscriptionResponder(" << &connection_ << ", " << streamId_
+              << "): ";
+  }
 };
 
 using SubscriptionResponder =