Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clear stop_iteration_ in DeferAfterCallActions destructor #93

Merged
merged 6 commits into from
Nov 10, 2020
Merged

Clear stop_iteration_ in DeferAfterCallActions destructor #93

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b416250
Clear stop_iteration_ flag non-status-returning callbacks.
mathetake Nov 10, 2020
f249f05
Remove unnecessary stop_iteration_ = false
mathetake Nov 10, 2020
8e22181
review: remove unnecessary protected:
mathetake Nov 10, 2020
fa1c9c4
review: StopIteration across Contexts.
PiotrSikora Nov 10, 2020
df9bce5
Merge pull request #1 from PiotrSikora/local-reply-stop2-fixup
mathetake Nov 10, 2020
70cfd06
review: remove unnecessary changes on DeferAfterCallActions
mathetake Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions include/proxy-wasm/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ class ContextBase : public RootInterface,

protected:
friend class WasmBase;
friend class DeferAfterCallActions;

void initializeRootBase(WasmBase *wasm, std::shared_ptr<PluginBase> plugin);
std::string makeRootLogPrefix(std::string_view vm_id) const;
Expand All @@ -402,11 +403,12 @@ class ContextBase : public RootInterface,

class DeferAfterCallActions {
public:
DeferAfterCallActions(ContextBase *context) : wasm_(context->wasm()) {}
DeferAfterCallActions(ContextBase *context) : context_(context) {}
~DeferAfterCallActions();

protected:
private:
mathetake marked this conversation as resolved.
Show resolved Hide resolved
WasmBase *const wasm_;
ContextBase *const context_;
};

uint32_t resolveQueueForTest(std::string_view vm_id, std::string_view queue_name);
Expand Down
8 changes: 4 additions & 4 deletions src/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ SharedData global_shared_data;

} // namespace

DeferAfterCallActions::~DeferAfterCallActions() { wasm_->doAfterVmCallActions(); }
DeferAfterCallActions::~DeferAfterCallActions() {
context_->stop_iteration_ = false;
context_->wasm()->doAfterVmCallActions();
}

WasmResult BufferBase::copyTo(WasmBase *wasm, size_t start, size_t length, uint64_t ptr_ptr,
uint64_t size_ptr) const {
Expand Down Expand Up @@ -624,23 +627,20 @@ WasmResult ContextBase::setTimerPeriod(std::chrono::milliseconds period,
FilterHeadersStatus ContextBase::convertVmCallResultToFilterHeadersStatus(uint64_t result) {
if (stop_iteration_ ||
result > static_cast<uint64_t>(FilterHeadersStatus::StopAllIterationAndWatermark)) {
stop_iteration_ = false;
return FilterHeadersStatus::StopAllIterationAndWatermark;
}
return static_cast<FilterHeadersStatus>(result);
}

FilterDataStatus ContextBase::convertVmCallResultToFilterDataStatus(uint64_t result) {
if (stop_iteration_ || result > static_cast<uint64_t>(FilterDataStatus::StopIterationNoBuffer)) {
stop_iteration_ = false;
return FilterDataStatus::StopIterationNoBuffer;
}
return static_cast<FilterDataStatus>(result);
}

FilterTrailersStatus ContextBase::convertVmCallResultToFilterTrailersStatus(uint64_t result) {
if (stop_iteration_ || result > static_cast<uint64_t>(FilterTrailersStatus::StopIteration)) {
stop_iteration_ = false;
return FilterTrailersStatus::StopIteration;
}
return static_cast<FilterTrailersStatus>(result);
Expand Down