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/01/07 18:09:31 UTC
[trafficserver] branch master updated: re-ordering event numbers
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 8bbfc59 re-ordering event numbers
8bbfc59 is described below
commit 8bbfc5927f960af412ee4e11ba1deea3ae4d4c9a
Author: Fei Deng <du...@gmail.com>
AuthorDate: Fri Dec 21 15:22:25 2018 -0600
re-ordering event numbers
---
doc/developer-guide/api/types/TSEvent.en.rst | 5 ++-
include/ts/apidefs.h.in | 54 +++++++++++++++++-----------
src/traffic_server/InkAPITest.cc | 2 +-
3 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/doc/developer-guide/api/types/TSEvent.en.rst b/doc/developer-guide/api/types/TSEvent.en.rst
index 96e8b73..3104c13 100644
--- a/doc/developer-guide/api/types/TSEvent.en.rst
+++ b/doc/developer-guide/api/types/TSEvent.en.rst
@@ -171,12 +171,12 @@ Enumeration Members
.. c:macro:: TS_EVENT_LIFECYCLE_CACHE_READY
-.. c:macro:: TS_EVENT_LIFECYCLE_MSG
-
.. c:macro:: TS_EVENT_LIFECYCLE_SERVER_SSL_CTX_INITIALIZED
.. c:macro:: TS_EVENT_LIFECYCLE_CLIENT_SSL_CTX_INITIALIZED
+.. c:macro:: TS_EVENT_LIFECYCLE_MSG
+
.. c:macro:: TS_EVENT_VCONN_START
.. c:macro:: TS_EVENT_VCONN_CLOSE
@@ -213,4 +213,3 @@ These are the event types used to drive continuations in the event system.
.. cpp:var:: EventType EVENT_IMMEDIATE
See :c:macro:`EVENT_IMMEDIATE`.
-
diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in
index 76189d1..bb3851f 100644
--- a/include/ts/apidefs.h.in
+++ b/include/ts/apidefs.h.in
@@ -334,12 +334,6 @@ typedef enum {
Event: TS_EVENT_LIFECYCLE_CACHE_READY
- TS_LIFECYCLE_MSG_HOOK
-
- Called in response to an external agent. The data is a pointer to an instance of TSPluginMsg.
-
- Event: TS_EVENT_LIFECYCLE_MSG
-
TS_LIFECYCLE_SERVER_SSL_CTX_INITIALIZED_HOOK
called every time after a server SSL_CTX has finished the initialization.
@@ -354,6 +348,12 @@ typedef enum {
Event: TS_EVENT_LIFECYCLE_CLIENT_SSL_CTX_INITIALIZED
+ TS_LIFECYCLE_MSG_HOOK
+
+ Called in response to an external agent. The data is a pointer to an instance of TSPluginMsg.
+
+ Event: TS_EVENT_LIFECYCLE_MSG
+
TS_LIFECYCLE_TASK_THREADS_READY_HOOK
called once, after the task threads have been started.
@@ -398,6 +398,7 @@ typedef enum {
TS_EVENT_TIMEOUT = 2,
TS_EVENT_ERROR = 3,
TS_EVENT_CONTINUE = 4,
+
TS_EVENT_VCONN_READ_READY = 100,
TS_EVENT_VCONN_WRITE_READY = 101,
TS_EVENT_VCONN_READ_COMPLETE = 102,
@@ -405,10 +406,17 @@ typedef enum {
TS_EVENT_VCONN_EOS = 104,
TS_EVENT_VCONN_INACTIVITY_TIMEOUT = 105,
TS_EVENT_VCONN_ACTIVE_TIMEOUT = 106,
+ TS_EVENT_VCONN_START = 107,
+ TS_EVENT_VCONN_CLOSE = 108,
+ TS_EVENT_VCONN_OUTBOUND_START = 109,
+ TS_EVENT_VCONN_OUTBOUND_CLOSE = 110,
+ TS_EVENT_VCONN_PRE_ACCEPT = TS_EVENT_VCONN_START, // Deprecated but still compatible
+
TS_EVENT_NET_CONNECT = 200,
TS_EVENT_NET_CONNECT_FAILED = 201,
TS_EVENT_NET_ACCEPT = 202,
TS_EVENT_NET_ACCEPT_FAILED = 204,
+
TS_EVENT_INTERNAL_206 = 206,
TS_EVENT_INTERNAL_207 = 207,
TS_EVENT_INTERNAL_208 = 208,
@@ -416,7 +424,9 @@ typedef enum {
TS_EVENT_INTERNAL_210 = 210,
TS_EVENT_INTERNAL_211 = 211,
TS_EVENT_INTERNAL_212 = 212,
+
TS_EVENT_HOST_LOOKUP = 500,
+
TS_EVENT_CACHE_OPEN_READ = 1102,
TS_EVENT_CACHE_OPEN_READ_FAILED = 1103,
TS_EVENT_CACHE_OPEN_WRITE = 1108,
@@ -439,11 +449,15 @@ typedef enum {
TS_EVENT_CACHE_LOOKUP_COMPLETE = 1133,
TS_EVENT_CACHE_READ_READY = 1134,
TS_EVENT_CACHE_READ_COMPLETE = 1135,
+
TS_EVENT_INTERNAL_1200 = 1200,
+
TS_EVENT_SSL_SESSION_GET = 2000,
TS_EVENT_SSL_SESSION_NEW = 2001,
TS_EVENT_SSL_SESSION_REMOVE = 2002,
+
TS_EVENT_AIO_DONE = 3900,
+
TS_EVENT_HTTP_CONTINUE = 60000,
TS_EVENT_HTTP_ERROR = 60001,
TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
@@ -462,19 +476,17 @@ typedef enum {
TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE = 60015,
TS_EVENT_HTTP_PRE_REMAP = 60016,
TS_EVENT_HTTP_POST_REMAP = 60017,
- TS_EVENT_LIFECYCLE_PORTS_INITIALIZED = 60018,
- TS_EVENT_LIFECYCLE_PORTS_READY = 60019,
- TS_EVENT_LIFECYCLE_CACHE_READY = 60020,
- TS_EVENT_LIFECYCLE_SERVER_SSL_CTX_INITIALIZED = 60021,
- TS_EVENT_LIFECYCLE_CLIENT_SSL_CTX_INITIALIZED = 60022,
- TS_EVENT_LIFECYCLE_TASK_THREADS_READY = 60027,
- TS_EVENT_LIFECYCLE_SHUTDOWN = 60028,
- TS_EVENT_VCONN_START = 60023,
- TS_EVENT_VCONN_PRE_ACCEPT = TS_EVENT_VCONN_START, // Deprecated but still compatible
- TS_EVENT_VCONN_CLOSE = 60026,
- TS_EVENT_LIFECYCLE_MSG = 60024,
- TS_EVENT_HTTP_REQUEST_BUFFER_COMPLETE = 60025,
- TS_EVENT_MGMT_UPDATE = 60100,
+ TS_EVENT_HTTP_REQUEST_BUFFER_COMPLETE = 60018,
+
+ TS_EVENT_LIFECYCLE_PORTS_INITIALIZED = 60100,
+ TS_EVENT_LIFECYCLE_PORTS_READY = 60101,
+ TS_EVENT_LIFECYCLE_CACHE_READY = 60102,
+ TS_EVENT_LIFECYCLE_SERVER_SSL_CTX_INITIALIZED = 60103,
+ TS_EVENT_LIFECYCLE_CLIENT_SSL_CTX_INITIALIZED = 60104,
+ TS_EVENT_LIFECYCLE_MSG = 60105,
+ TS_EVENT_LIFECYCLE_TASK_THREADS_READY = 60106,
+ TS_EVENT_LIFECYCLE_SHUTDOWN = 60107,
+
TS_EVENT_INTERNAL_60200 = 60200,
TS_EVENT_INTERNAL_60201 = 60201,
TS_EVENT_INTERNAL_60202 = 60202,
@@ -482,8 +494,8 @@ typedef enum {
TS_EVENT_SSL_SERVERNAME = 60204,
TS_EVENT_SSL_VERIFY_SERVER = 60205,
TS_EVENT_SSL_VERIFY_CLIENT = 60206,
- TS_EVENT_VCONN_OUTBOUND_START = 60207,
- TS_EVENT_VCONN_OUTBOUND_CLOSE = 60208
+
+ TS_EVENT_MGMT_UPDATE = 60300
} TSEvent;
#define TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP TS_EVENT_HTTP_PRE_REMAP /* backwards compat */
diff --git a/src/traffic_server/InkAPITest.cc b/src/traffic_server/InkAPITest.cc
index 9f7710f..6d38500 100644
--- a/src/traffic_server/InkAPITest.cc
+++ b/src/traffic_server/InkAPITest.cc
@@ -6682,7 +6682,7 @@ typedef enum {
ORIG_TS_EVENT_HTTP_SSN_CLOSE = 60014,
ORIG_TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE = 60015,
- ORIG_TS_EVENT_MGMT_UPDATE = 60100
+ ORIG_TS_EVENT_MGMT_UPDATE = 60300
} ORIG_TSEvent;
typedef enum {