summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZhidao HONG <z.hong@f5.com>2024-04-18 18:34:07 +0800
committerZhidao HONG <z.hong@f5.com>2024-08-20 09:17:23 +0800
commit5f6ae1a189b1736eb7cc35f1ff8018fd8606db9b (patch)
tree229be8f32766bf7f1f88ee78da2349633e93e1a5
parentecb3f86c8528a26d770e93bd5296b780981e20ff (diff)
downloadunit-5f6ae1a189b1736eb7cc35f1ff8018fd8606db9b.tar.gz
unit-5f6ae1a189b1736eb7cc35f1ff8018fd8606db9b.tar.bz2
var: Remove unused functions and structure fields
-rw-r--r--src/nxt_tstr.c49
-rw-r--r--src/nxt_tstr.h5
-rw-r--r--src/nxt_var.c6
3 files changed, 0 insertions, 60 deletions
diff --git a/src/nxt_tstr.c b/src/nxt_tstr.c
index a72d7ddc..a6d2e7ad 100644
--- a/src/nxt_tstr.c
+++ b/src/nxt_tstr.c
@@ -36,14 +36,8 @@ struct nxt_tstr_query_s {
nxt_tstr_state_t *state;
nxt_tstr_cache_t *cache;
- nxt_uint_t waiting;
- nxt_uint_t failed; /* 1 bit */
-
void *ctx;
void *data;
-
- nxt_work_handler_t ready;
- nxt_work_handler_t error;
};
@@ -257,17 +251,12 @@ nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query, nxt_tstr_t *tstr,
return NXT_OK;
}
- if (nxt_slow_path(query->failed)) {
- return NXT_ERROR;
- }
-
if (tstr->type == NXT_TSTR_VAR) {
ret = nxt_var_interpreter(task, query->state, &query->cache->var,
tstr->u.var, val, query->ctx,
tstr->flags & NXT_TSTR_LOGGING);
if (nxt_slow_path(ret != NXT_OK)) {
- query->failed = 1;
return NXT_ERROR;
}
@@ -277,7 +266,6 @@ nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query, nxt_tstr_t *tstr,
tstr->u.js, val, query->ctx);
if (nxt_slow_path(ret != NXT_OK)) {
- query->failed = 1;
return NXT_ERROR;
}
#endif
@@ -299,43 +287,6 @@ nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query, nxt_tstr_t *tstr,
}
-nxt_bool_t
-nxt_tstr_query_failed(nxt_tstr_query_t *query)
-{
- return query->failed;
-}
-
-
-void
-nxt_tstr_query_resolve(nxt_task_t *task, nxt_tstr_query_t *query, void *data,
- nxt_work_handler_t ready, nxt_work_handler_t error)
-{
- query->data = data;
- query->ready = ready;
- query->error = error;
-
- if (query->waiting == 0) {
- nxt_work_queue_add(&task->thread->engine->fast_work_queue,
- query->failed ? query->error : query->ready,
- task, query->ctx, query->data);
- }
-}
-
-
-void
-nxt_tstr_query_handle(nxt_task_t *task, nxt_tstr_query_t *query,
- nxt_bool_t failed)
-{
- query->failed |= failed;
-
- if (--query->waiting == 0) {
- nxt_work_queue_add(&task->thread->engine->fast_work_queue,
- query->failed ? query->error : query->ready,
- task, query->ctx, query->data);
- }
-}
-
-
void
nxt_tstr_query_release(nxt_tstr_query_t *query)
{
diff --git a/src/nxt_tstr.h b/src/nxt_tstr.h
index 574b4281..2aa905df 100644
--- a/src/nxt_tstr.h
+++ b/src/nxt_tstr.h
@@ -52,11 +52,6 @@ nxt_int_t nxt_tstr_query_init(nxt_tstr_query_t **query_p,
nxt_mp_t *mp);
nxt_int_t nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query,
nxt_tstr_t *tstr, nxt_str_t *val);
-nxt_bool_t nxt_tstr_query_failed(nxt_tstr_query_t *query);
-void nxt_tstr_query_resolve(nxt_task_t *task, nxt_tstr_query_t *query,
- void *data, nxt_work_handler_t ready, nxt_work_handler_t error);
-void nxt_tstr_query_handle(nxt_task_t *task, nxt_tstr_query_t *query,
- nxt_bool_t failed);
void nxt_tstr_query_release(nxt_tstr_query_t *query);
diff --git a/src/nxt_var.c b/src/nxt_var.c
index 94d10cd8..16aa1c7e 100644
--- a/src/nxt_var.c
+++ b/src/nxt_var.c
@@ -30,14 +30,8 @@ struct nxt_var_query_s {
nxt_var_cache_t cache;
- nxt_uint_t waiting;
- nxt_uint_t failed; /* 1 bit */
-
void *ctx;
void *data;
-
- nxt_work_handler_t ready;
- nxt_work_handler_t error;
};