From 1289549d1f42588cdea571810ac397f47273ada1 Mon Sep 17 00:00:00 2001 From: Walter Karas Date: Mon, 12 Nov 2018 10:35:00 -0600 Subject: [PATCH 1/2] 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 ecdc8244402..53d692920a4 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, From 310be619eb8ce55a966d81b79164a73a6e578906 Mon Sep 17 00:00:00 2001 From: Walter Karas Date: Mon, 12 Nov 2018 11:04:27 -0600 Subject: [PATCH 2/2] 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 53d692920a4..b8ab9629187 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 fc6c3f601a0..92e64fd1fcd 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 acc61a39688..fff6e0323bb 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(edata); SsnData *ssnData = static_cast(TSContDataGet(contp)); if (!ssnData) {