You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2018/11/26 20:28:38 UTC
[trafficserver] branch master updated (63ea263 -> ea65e96)
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 63ea263 TCL: Remove TCL from our code base
new 8b40c57 Add TS_EVENT_AIO_DONE, deprecate TS_AIO_EVENT_DONE.
new ea65e96 Remove deprecated event TS_AIO_EVENT_DONE.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
include/ts/apidefs.h.in | 2 +-
plugins/experimental/buffer_upload/buffer_upload.cc | 6 +++---
plugins/experimental/traffic_dump/traffic_dump.cc | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
[trafficserver] 01/02: Add TS_EVENT_AIO_DONE,
deprecate TS_AIO_EVENT_DONE.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 8b40c578c77d8a31ee4fb57a912f269ad9a23aec
Author: Walter Karas <wk...@oath.com>
AuthorDate: Mon Nov 12 10:35:00 2018 -0600
Add TS_EVENT_AIO_DONE, deprecate TS_AIO_EVENT_DONE.
---
include/ts/apidefs.h.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in
index ecdc824..53d6929 100644
--- a/include/ts/apidefs.h.in
+++ b/include/ts/apidefs.h.in
@@ -429,7 +429,8 @@ typedef enum {
TS_EVENT_SSL_SESSION_GET = 2000,
TS_EVENT_SSL_SESSION_NEW = 2001,
TS_EVENT_SSL_SESSION_REMOVE = 2002,
- TS_AIO_EVENT_DONE = 3900,
+ TS_EVENT_AIO_DONE = 3900,
+ TS_AIO_EVENT_DONE = TS_EVENT_AIO_DONE, // Deprecated, do not use in new code.
TS_EVENT_HTTP_CONTINUE = 60000,
TS_EVENT_HTTP_ERROR = 60001,
TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
[trafficserver] 02/02: Remove deprecated event TS_AIO_EVENT_DONE.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit ea65e96db36f549b716e537b22d508f7ebd5996c
Author: Walter Karas <wk...@oath.com>
AuthorDate: Mon Nov 12 11:04:27 2018 -0600
Remove deprecated event TS_AIO_EVENT_DONE.
---
include/ts/apidefs.h.in | 1 -
plugins/experimental/buffer_upload/buffer_upload.cc | 6 +++---
plugins/experimental/traffic_dump/traffic_dump.cc | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in
index 53d6929..b8ab962 100644
--- a/include/ts/apidefs.h.in
+++ b/include/ts/apidefs.h.in
@@ -430,7 +430,6 @@ typedef enum {
TS_EVENT_SSL_SESSION_NEW = 2001,
TS_EVENT_SSL_SESSION_REMOVE = 2002,
TS_EVENT_AIO_DONE = 3900,
- TS_AIO_EVENT_DONE = TS_EVENT_AIO_DONE, // Deprecated, do not use in new code.
TS_EVENT_HTTP_CONTINUE = 60000,
TS_EVENT_HTTP_ERROR = 60001,
TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index fc6c3f6..92e64fd 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -543,12 +543,12 @@ pvc_plugin(TSCont contp, TSEvent event, void *edata)
pvc_process_n_read(contp, event, my_state);
} else if (edata == my_state->n_write_vio) {
pvc_process_n_write(contp, event, my_state);
- } else if (event == TS_AIO_EVENT_DONE && uconfig->use_disk_buffer) {
+ } else if (event == TS_EVENT_AIO_DONE && uconfig->use_disk_buffer) {
TSMutexLock(my_state->disk_io_mutex);
int size = TSAIONBytesGet(callback);
char *buf = TSAIOBufGet(callback);
if (buf != my_state->chunk_buffer) {
- // this TS_AIO_EVENT_DONE event is from TSAIOWrite()
+ // this TS_EVENT_AIO_DONE event is from TSAIOWrite()
TSDebug(DEBUG_TAG, "aio write size: %d", size);
my_state->size_written += size;
if (buf != nullptr) {
@@ -561,7 +561,7 @@ pvc_plugin(TSCont contp, TSEvent event, void *edata)
}
}
} else {
- // this TS_AIO_EVENT_DONE event is from TSAIORead()
+ // this TS_EVENT_AIO_DONE event is from TSAIORead()
TSDebug(DEBUG_TAG, "aio read size: %d", size);
TSIOBufferWrite(my_state->req_buffer, my_state->chunk_buffer, size);
my_state->size_read += size;
diff --git a/plugins/experimental/traffic_dump/traffic_dump.cc b/plugins/experimental/traffic_dump/traffic_dump.cc
index acc61a3..fff6e03 100644
--- a/plugins/experimental/traffic_dump/traffic_dump.cc
+++ b/plugins/experimental/traffic_dump/traffic_dump.cc
@@ -290,7 +290,7 @@ int
session_aio_handler(TSCont contp, TSEvent event, void *edata)
{
switch (event) {
- case TS_AIO_EVENT_DONE: {
+ case TS_EVENT_AIO_DONE: {
TSAIOCallback cb = static_cast<TSAIOCallback>(edata);
SsnData *ssnData = static_cast<SsnData *>(TSContDataGet(contp));
if (!ssnData) {