Skip to content

regex_revalidate: don't start a new self scheduling config handler on every config reload #4713

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
shinrich merged 1 commit into from
Jan 7, 2019
Merged

regex_revalidate: don't start a new self scheduling config handler on every config reload #4713

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
13 changes: 7 additions & 6 deletions plugins/regex_revalidate/regex_revalidate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
limitations under the License.
*/

#include "tscore/ink_defs.h"
#include "tscore/ink_platform.h"
#include <ts/ts.h>

#include <stdlib.h>
#include <stdio.h>
Expand All @@ -32,7 +31,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <ts/ts.h>

#ifdef HAVE_PCRE_PCRE_H
#include <pcre/pcre.h>
Expand Down Expand Up @@ -331,7 +329,7 @@ list_config(plugin_state_t *pstate, invalidate_t *i)
}

static int
free_handler(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
free_handler(TSCont cont, TSEvent event, void *edata)
{
invalidate_t *iptr;

Expand All @@ -343,7 +341,7 @@ free_handler(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
}

static int
config_handler(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
config_handler(TSCont cont, TSEvent event, void *edata)
{
plugin_state_t *pstate;
invalidate_t *i, *iptr;
Expand Down Expand Up @@ -379,7 +377,10 @@ config_handler(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)

TSMutexUnlock(mutex);

TSContSchedule(cont, CONFIG_TMOUT, TS_THREAD_POOL_TASK);
// Don't reschedule for TS_EVENT_MGMT_UPDATE
if (event == TS_EVENT_TIMEOUT) {
TSContSchedule(cont, CONFIG_TMOUT, TS_THREAD_POOL_TASK);
}
return 0;
}

Expand Down