Skip to content

Make sure each remap rule gets its own continuation #8675

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

Merged
zwoop merged 1 commit into from
Feb 17, 2022
Merged

Make sure each remap rule gets its own continuation #8675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions plugins/experimental/statichit/statichit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ constexpr char PLUGIN[] = "statichit";
VDEBUG("vio=%p vio.cont=%p, vio.cont.data=%p, vio.vc=%p " fmt, (vio), TSVIOContGet(vio), TSContDataGet(TSVIOContGet(vio)), \
TSVIOVConnGet(vio), ##__VA_ARGS__)

static TSCont TxnHook;

static int StatCountBytes = -1;
static int StatCountResponses = -1;

Expand All @@ -69,7 +67,7 @@ struct StaticHitConfig {
{
}

~StaticHitConfig() {}
~StaticHitConfig() { TSContDestroy(cont); }

std::string filePath;
std::string mimeType;
Expand All @@ -79,6 +77,8 @@ struct StaticHitConfig {
int maxAge = 0;

bool disableExact = false;

TSCont cont;
};

struct StaticHitRequest;
Expand Down Expand Up @@ -550,8 +550,6 @@ StaticHitTxnHook(TSCont contp, TSEvent event, void *edata)
TSReturnCode
TSRemapInit(TSRemapInterface * /* api_info */, char * /* errbuf */, int /* errbuf_size */)
{
TxnHook = TSContCreate(StaticHitTxnHook, nullptr);

if (TSStatFindName("statichit.response_bytes", &StatCountBytes) == TS_ERROR) {
StatCountBytes = TSStatCreate("statichit.response_bytes", TS_RECORDDATATYPE_COUNTER, TS_STAT_NON_PERSISTENT, TS_STAT_SYNC_SUM);
}
Expand Down Expand Up @@ -595,9 +593,8 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
TSHttpTxnConfigIntSet(rh, TS_CONFIG_HTTP_CACHE_HTTP, 0);
StaticHitSetupIntercept(static_cast<StaticHitConfig *>(ih), rh);
} else {
TSHttpTxnHookAdd(rh, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, TxnHook);
TSHttpTxnHookAdd(rh, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, static_cast<StaticHitConfig *>(ih)->cont);
}
TSContDataSet(TxnHook, ih);

return TSREMAP_NO_REMAP; // This plugin never rewrites anything.
}
Expand Down Expand Up @@ -673,6 +670,10 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
tc->successCode = successCode;
}

// Finally, create the continuation to use for this remap rule, tracking the config as cont data.
tc->cont = TSContCreate(StaticHitTxnHook, nullptr);
TSContDataSet(tc->cont, tc);

*ih = static_cast<void *>(tc);

return TS_SUCCESS;
Expand Down