You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2019/02/15 18:32:24 UTC
[trafficserver] branch 8.0.x updated: Revert "Add transform
TSIOBuffer watermark APIs."
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 52329e7 Revert "Add transform TSIOBuffer watermark APIs."
52329e7 is described below
commit 52329e72d814b3f1e09fa5ec4cf1966c9183c6ee
Author: Bryan Call <bc...@apache.org>
AuthorDate: Fri Feb 15 10:31:59 2019 -0800
Revert "Add transform TSIOBuffer watermark APIs."
This reverts commit e5fd268c754d2e88c59a28b55feea6177693be85.
---
doc/admin-guide/plugins/lua.en.rst | 24 ---------------------
plugins/lua/ts_lua_common.h | 1 -
plugins/lua/ts_lua_http.c | 43 --------------------------------------
plugins/lua/ts_lua_transform.c | 9 +-------
4 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/doc/admin-guide/plugins/lua.en.rst b/doc/admin-guide/plugins/lua.en.rst
index 584d44f..e820254 100644
--- a/doc/admin-guide/plugins/lua.en.rst
+++ b/doc/admin-guide/plugins/lua.en.rst
@@ -2236,30 +2236,6 @@ Here is an example:
`TOP <#ts-lua-plugin>`_
-ts.http.resp_transform.get_upstream_watermark_bytes
----------------------------------------------------
-**syntax:** *ts.http.resp_transform.get_upstream_watermark_bytes()*
-
-**context:** transform handler
-
-**description**: This function can be used to retrive the current watermark bytes for the upstream transform buffer.
-
-
-`TOP <#ts-lua-plugin>`_
-
-ts.http.resp_transform.set_upstream_watermark_bytes
----------------------------------------------------
-**syntax:** *ts.http.resp_transform.set_upstream_watermark_bytes(NUMBER)*
-
-**context:** transform handler
-
-**description**: This function can be used to set the watermark bytes of the upstream transform buffer.
-
-Setting the watermark bytes above 32kb may improve the performance of the transform handler.
-
-
-`TOP <#ts-lua-plugin>`_
-
ts.http.resp_transform.set_downstream_bytes
-------------------------------------------
**syntax:** *ts.http.resp_transform.set_downstream_bytes(NUMBER)*
diff --git a/plugins/lua/ts_lua_common.h b/plugins/lua/ts_lua_common.h
index dba8b7d..b98e42f 100644
--- a/plugins/lua/ts_lua_common.h
+++ b/plugins/lua/ts_lua_common.h
@@ -144,7 +144,6 @@ typedef struct {
ts_lua_http_ctx *hctx;
int64_t upstream_bytes;
- int64_t upstream_watermark_bytes;
int64_t downstream_bytes;
int64_t total;
diff --git a/plugins/lua/ts_lua_http.c b/plugins/lua/ts_lua_http.c
index b10fefb..e840861 100644
--- a/plugins/lua/ts_lua_http.c
+++ b/plugins/lua/ts_lua_http.c
@@ -105,8 +105,6 @@ static void ts_lua_inject_server_state_variables(lua_State *L);
static void ts_lua_inject_http_resp_transform_api(lua_State *L);
static int ts_lua_http_resp_transform_get_upstream_bytes(lua_State *L);
-static int ts_lua_http_resp_transform_get_upstream_watermark_bytes(lua_State *L);
-static int ts_lua_http_resp_transform_set_upstream_watermark_bytes(lua_State *L);
static int ts_lua_http_resp_transform_set_downstream_bytes(lua_State *L);
void
@@ -196,12 +194,6 @@ ts_lua_inject_http_resp_transform_api(lua_State *L)
lua_pushcfunction(L, ts_lua_http_resp_transform_get_upstream_bytes);
lua_setfield(L, -2, "get_upstream_bytes");
- lua_pushcfunction(L, ts_lua_http_resp_transform_get_upstream_watermark_bytes);
- lua_setfield(L, -2, "get_upstream_watermark_bytes");
-
- lua_pushcfunction(L, ts_lua_http_resp_transform_set_upstream_watermark_bytes);
- lua_setfield(L, -2, "set_upstream_watermark_bytes");
-
lua_pushcfunction(L, ts_lua_http_resp_transform_set_downstream_bytes);
lua_setfield(L, -2, "set_downstream_bytes");
}
@@ -893,41 +885,6 @@ ts_lua_http_resp_transform_get_upstream_bytes(lua_State *L)
}
static int
-ts_lua_http_resp_transform_get_upstream_watermark_bytes(lua_State *L)
-{
- ts_lua_http_transform_ctx *transform_ctx;
-
- transform_ctx = ts_lua_get_http_transform_ctx(L);
- if (transform_ctx == NULL) {
- TSError("[ts_lua] missing transform_ctx");
- return 0;
- }
-
- lua_pushnumber(L, transform_ctx->upstream_watermark_bytes);
-
- return 1;
-}
-
-static int
-ts_lua_http_resp_transform_set_upstream_watermark_bytes(lua_State *L)
-{
- int64_t n;
- ts_lua_http_transform_ctx *transform_ctx;
-
- transform_ctx = ts_lua_get_http_transform_ctx(L);
- if (transform_ctx == NULL) {
- TSError("[ts_lua] missing transform_ctx");
- return 0;
- }
-
- n = luaL_checkinteger(L, 1);
-
- transform_ctx->upstream_watermark_bytes = n;
-
- return 0;
-}
-
-static int
ts_lua_http_resp_transform_set_downstream_bytes(lua_State *L)
{
int64_t n;
diff --git a/plugins/lua/ts_lua_transform.c b/plugins/lua/ts_lua_transform.c
index 56c27fc..e66a3b0 100644
--- a/plugins/lua/ts_lua_transform.c
+++ b/plugins/lua/ts_lua_transform.c
@@ -66,7 +66,7 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
TSVIO input_vio;
TSIOBufferReader input_reader;
TSIOBufferBlock blk;
- int64_t toread, towrite, blk_len, upstream_done, input_avail, input_wm_bytes, l;
+ int64_t toread, towrite, blk_len, upstream_done, input_avail, l;
const char *start;
const char *res;
size_t res_len;
@@ -97,13 +97,6 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
TSDebug(TS_LUA_DEBUG_TAG, "[%s] no input VIO and output VIO", __FUNCTION__);
empty_input = 1;
}
- } else { // input VIO exists
- input_wm_bytes = TSIOBufferWaterMarkGet(TSVIOBufferGet(input_vio));
- if (transform_ctx->upstream_watermark_bytes >= 0 && transform_ctx->upstream_watermark_bytes != input_wm_bytes) {
- TSDebug(TS_LUA_DEBUG_TAG, "[%s] Setting input_vio watermark to %" PRId64 " bytes", __FUNCTION__,
- transform_ctx->upstream_watermark_bytes);
- TSIOBufferWaterMarkSet(TSVIOBufferGet(input_vio), transform_ctx->upstream_watermark_bytes);
- }
}
if (empty_input == 0) {