Merge pull request #1 from PiotrSikora/local-reply-stop2-fixup

review: StopIteration across Contexts.

Author: mathetake

include/proxy-wasm/context.h

@@ -167,11 +167,6 @@ class ContextBase : public RootInterface,
   // Called before deleting the context.
   virtual void destroy();
 
-  // Called to raise the flag which indicates that the context should stop iteration regardless of
-  // returned filter status from Proxy-Wasm extensions. For example, we ignore
-  // FilterHeadersStatus::Continue after a local reponse is sent by the host.
-  void stopIteration() { stop_iteration_ = true; };
-
   /**
    * Calls into the VM.
    * These are implemented by the proxy-independent host code. They are virtual to support some
@@ -391,7 +386,6 @@ class ContextBase : public RootInterface,
   std::shared_ptr<PluginBase> plugin_;
   bool in_vm_context_created_ = false;
   bool destroyed_ = false;
-  bool stop_iteration_ = false;
 
 private:
   // helper functions

include/proxy-wasm/wasm.h

@@ -122,6 +122,12 @@ class WasmBase : public std::enable_shared_from_this<WasmBase> {
 
   AbiVersion abiVersion() { return abi_version_; }
 
+  // Called to raise the flag which indicates that the context should stop iteration regardless of
+  // returned filter status from Proxy-Wasm extensions. For example, we ignore
+  // FilterHeadersStatus::Continue after a local reponse is sent by the host.
+  void stopNextIteration(bool stop) { stop_iteration_ = stop; };
+  bool isNextIterationStopped() { return stop_iteration_; };
+
   void addAfterVmCallAction(std::function<void()> f) { after_vm_call_actions_.push_back(f); }
   void doAfterVmCallActions() {
     // NB: this may be deleted by a delayed function unless prevented.
@@ -223,6 +229,7 @@ class WasmBase : public std::enable_shared_from_this<WasmBase> {
   std::string code_;
   std::string vm_configuration_;
   bool allow_precompiled_ = false;
+  bool stop_iteration_ = false;
   FailState failed_ = FailState::Ok; // Wasm VM fatal error.
 
   // ABI version.

src/context.cc

@@ -226,7 +226,7 @@ SharedData global_shared_data;
 } // namespace
 
 DeferAfterCallActions::~DeferAfterCallActions() {
-  context_->stop_iteration_ = false;
+  context_->wasm()->stopNextIteration(false);
   context_->wasm()->doAfterVmCallActions();
 }
 
@@ -625,22 +625,24 @@ WasmResult ContextBase::setTimerPeriod(std::chrono::milliseconds period,
 }
 
 FilterHeadersStatus ContextBase::convertVmCallResultToFilterHeadersStatus(uint64_t result) {
-  if (stop_iteration_ ||
+  if (wasm()->isNextIterationStopped() ||
       result > static_cast<uint64_t>(FilterHeadersStatus::StopAllIterationAndWatermark)) {
     return FilterHeadersStatus::StopAllIterationAndWatermark;
   }
   return static_cast<FilterHeadersStatus>(result);
 }
 
 FilterDataStatus ContextBase::convertVmCallResultToFilterDataStatus(uint64_t result) {
-  if (stop_iteration_ || result > static_cast<uint64_t>(FilterDataStatus::StopIterationNoBuffer)) {
+  if (wasm()->isNextIterationStopped() ||
+      result > static_cast<uint64_t>(FilterDataStatus::StopIterationNoBuffer)) {
     return FilterDataStatus::StopIterationNoBuffer;
   }
   return static_cast<FilterDataStatus>(result);
 }
 
 FilterTrailersStatus ContextBase::convertVmCallResultToFilterTrailersStatus(uint64_t result) {
-  if (stop_iteration_ || result > static_cast<uint64_t>(FilterTrailersStatus::StopIteration)) {
+  if (wasm()->isNextIterationStopped() ||
+      result > static_cast<uint64_t>(FilterTrailersStatus::StopIteration)) {
     return FilterTrailersStatus::StopIteration;
   }
   return static_cast<FilterTrailersStatus>(result);

src/exports.cc

@@ -186,7 +186,7 @@ Word send_local_response(void *raw_context, Word response_code, Word response_co
   auto additional_headers = toPairs(additional_response_header_pairs.value());
   context->sendLocalResponse(response_code, body.value(), std::move(additional_headers), grpc_code,
                              details.value());
-  context->stopIteration();
+  context->wasm()->stopNextIteration(true);
   return WasmResult::Ok;
 }