Skip to content

Add TS_EVENT_AIO_DONE, remove TS_AIO_EVENT_DONE #4596

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 2 commits into from
Nov 26, 2018
Merged

Add TS_EVENT_AIO_DONE, remove TS_AIO_EVENT_DONE #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1289549
Add TS_EVENT_AIO_DONE, deprecate TS_AIO_EVENT_DONE.
Nov 12, 2018
310be61
Remove deprecated event TS_AIO_EVENT_DONE.
Nov 12, 2018
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
2 changes: 1 addition & 1 deletion include/ts/apidefs.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ 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_EVENT_HTTP_CONTINUE = 60000,
TS_EVENT_HTTP_ERROR = 60001,
TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
Expand Down
6 changes: 3 additions & 3 deletions plugins/experimental/buffer_upload/buffer_upload.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/traffic_dump/traffic_dump.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down