Skip to content

Ts 4256 fix abort problem with inliner #511

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

Closed
dmorilha wants to merge 2 commits into from
Closed

Ts 4256 fix abort problem with inliner #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49d9e60
renaming null_transform entry to inliner_transform
dmorilha-yahoo Mar 4, 2016
57ccdc8
[TS-4256] flagging aborts and avoiding consuming the reader
dmorilha-yahoo Mar 4, 2016
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
4 changes: 2 additions & 2 deletions plugins/experimental/inliner/ats-inliner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ handle_transform(const TSCont c)
}

int
null_transform(TSCont c, TSEvent e, void *)
inliner_transform(TSCont c, TSEvent e, void *)
{
if (TSVConnClosedGet(c)) {
TSDebug(PLUGIN_TAG, "connection closed");
Expand Down Expand Up @@ -165,7 +165,7 @@ void
transform_add(const TSHttpTxn t)
{
assert(t != NULL);
const TSVConn vconnection = TSTransformCreate(null_transform, t);
const TSVConn vconnection = TSTransformCreate(inliner_transform, t);
assert(vconnection != NULL);
TSHttpTxnHookAdd(t, TS_HTTP_RESPONSE_TRANSFORM_HOOK, vconnection);
}
Expand Down
3 changes: 2 additions & 1 deletion plugins/experimental/inliner/inliner-handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace ats
namespace inliner
{
Handler::Handler(const TSIOBufferReader r, ats::io::IOSinkPointer &&i)
: ioSink_(i), sink_(ioSink_->branch()), sink2_(sink_->branch()), reader_(TSIOBufferReaderClone(r)), counter_(0)
: ioSink_(i), sink_(ioSink_->branch()), sink2_(sink_->branch()), reader_(TSIOBufferReaderClone(r)), counter_(0), abort_(false)
{
assert(ioSink_);
assert(sink_);
Expand Down Expand Up @@ -141,6 +141,7 @@ namespace inliner
void
Handler::abort(void)
{
abort_ = true;
assert(ioSink_);
ioSink_->abort();
}
Expand Down
9 changes: 6 additions & 3 deletions plugins/experimental/inliner/inliner-handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,16 @@ namespace inliner
ats::io::SinkPointer sink_, sink2_;
const TSIOBufferReader reader_;
size_t counter_;
bool abort_;

~Handler()
{
assert(reader_ != NULL);
const int64_t available = TSIOBufferReaderAvail(reader_);
if (available > 0) {
TSIOBufferReaderConsume(reader_, available);
if (!abort_) {
const int64_t available = TSIOBufferReaderAvail(reader_);
if (available > 0) {
TSIOBufferReaderConsume(reader_, available);
}
}
TSIOBufferReaderFree(reader_);
}
Expand Down