This is an automated email from the ASF dual-hosted git repository.
masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push:
new f5b0395 Print event number
f5b0395 is described below
commit f5b039539d13debe891b821afeb1dbeb709caa74
Author: Masaori Koshiba <masa...@apache.org>
AuthorDate: Mon Jan 22 09:59:12 2018 +1100
Print event number
---
iocore/net/QUICNetVConnection.cc | 10 +++++-----
iocore/net/quic/QUICHandshake.cc | 8 ++++----
iocore/net/quic/QUICStream.cc | 8 ++++----
proxy/hq/HQClientTransaction.cc | 8 ++++----
proxy/hq/QUICSimpleApp.cc | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 3a64bca..aec2fb2 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -448,7 +448,7 @@ QUICNetVConnection::state_handshake(int event, Event *data)
this->_handle_idle_timeout();
break;
default:
- QUICConDebug("Unexpected event: %s", QUICDebugNames::quic_event(event));
+ QUICConDebug("Unexpected event: %s (%d)",
QUICDebugNames::quic_event(event), event);
}
if (error->cls != QUICErrorClass::NONE) {
@@ -479,7 +479,7 @@ QUICNetVConnection::state_connection_established(int event,
Event *data)
break;
}
default:
- QUICConDebug("Unexpected event: %s", QUICDebugNames::quic_event(event));
+ QUICConDebug("Unexpected event: %s (%d)",
QUICDebugNames::quic_event(event), event);
}
if (error->cls != QUICErrorClass::NONE) {
@@ -509,7 +509,7 @@ QUICNetVConnection::state_connection_closing(int event,
Event *data)
this->_switch_to_close_state();
break;
default:
- QUICConDebug("Unexpected event: %s", QUICDebugNames::quic_event(event));
+ QUICConDebug("Unexpected event: %s (%d)",
QUICDebugNames::quic_event(event), event);
}
return EVENT_DONE;
@@ -535,7 +535,7 @@ QUICNetVConnection::state_connection_draining(int event,
Event *data)
this->_switch_to_close_state();
break;
default:
- QUICConDebug("Unexpected event: %s", QUICDebugNames::quic_event(event));
+ QUICConDebug("Unexpected event: %s (%d)",
QUICDebugNames::quic_event(event), event);
}
return EVENT_DONE;
@@ -566,7 +566,7 @@ QUICNetVConnection::state_connection_closed(int event,
Event *data)
break;
}
default:
- QUICConDebug("Unexpected event: %s", QUICDebugNames::quic_event(event));
+ QUICConDebug("Unexpected event: %s (%d)",
QUICDebugNames::quic_event(event), event);
}
return EVENT_DONE;
diff --git a/iocore/net/quic/QUICHandshake.cc b/iocore/net/quic/QUICHandshake.cc
index e4612c3..44a172a 100644
--- a/iocore/net/quic/QUICHandshake.cc
+++ b/iocore/net/quic/QUICHandshake.cc
@@ -280,7 +280,7 @@ QUICHandshake::remote_transport_parameters()
int
QUICHandshake::state_initial(int event, Event *data)
{
- QUICHSDebug("%s", get_vc_event_name(event));
+ QUICHSDebug("%s (%d)", get_vc_event_name(event), event);
QUICErrorUPtr error = QUICErrorUPtr(new QUICNoError());
switch (event) {
@@ -323,7 +323,7 @@ QUICHandshake::state_initial(int event, Event *data)
int
QUICHandshake::state_key_exchange(int event, Event *data)
{
- QUICHSDebug("%s", get_vc_event_name(event));
+ QUICHSDebug("%s (%d)", get_vc_event_name(event), event);
QUICErrorUPtr error = QUICErrorUPtr(new QUICNoError());
switch (event) {
@@ -363,7 +363,7 @@ QUICHandshake::state_key_exchange(int event, Event *data)
int
QUICHandshake::state_auth(int event, Event *data)
{
- QUICHSDebug("%s", get_vc_event_name(event));
+ QUICHSDebug("%s (%d)", get_vc_event_name(event), event);
QUICErrorUPtr error = QUICErrorUPtr(new QUICNoError());
switch (event) {
@@ -401,7 +401,7 @@ QUICHandshake::state_address_validation(int event, void
*data)
int
QUICHandshake::state_complete(int event, void *data)
{
- QUICHSDebug("%s", get_vc_event_name(event));
+ QUICHSDebug("%s (%d)", get_vc_event_name(event), event);
QUICHSDebug("Got an event on complete state. Ignoring it for now.");
return EVENT_DONE;
diff --git a/iocore/net/quic/QUICStream.cc b/iocore/net/quic/QUICStream.cc
index c2370d1..071da7e 100644
--- a/iocore/net/quic/QUICStream.cc
+++ b/iocore/net/quic/QUICStream.cc
@@ -94,7 +94,7 @@ QUICStream::final_offset()
int
QUICStream::state_stream_open(int event, void *data)
{
- QUICStreamDebug("%s", get_vc_event_name(event));
+ QUICStreamDebug("%s (%d)", get_vc_event_name(event), event);
QUICErrorUPtr error = std::unique_ptr<QUICError>(new QUICNoError());
switch (event) {
@@ -154,7 +154,7 @@ QUICStream::state_stream_open(int event, void *data)
int
QUICStream::state_stream_closed(int event, void *data)
{
- QUICStreamDebug("%s", get_vc_event_name(event));
+ QUICStreamDebug("%s (%d)", get_vc_event_name(event), event);
switch (event) {
case VC_EVENT_READ_READY:
@@ -400,7 +400,7 @@ QUICStream::_signal_read_event()
this_ethread()->schedule_imm(this->_read_vio._cont, event,
&this->_read_vio);
}
- QUICStreamDebug("%s", get_vc_event_name(event));
+ QUICStreamDebug("%s (%d)", get_vc_event_name(event), event);
}
/**
@@ -422,7 +422,7 @@ QUICStream::_signal_write_event()
this_ethread()->schedule_imm(this->_write_vio._cont, event,
&this->_write_vio);
}
- QUICStreamDebug("%s", get_vc_event_name(event));
+ QUICStreamDebug("%s (%d)", get_vc_event_name(event), event);
}
int64_t
diff --git a/proxy/hq/HQClientTransaction.cc b/proxy/hq/HQClientTransaction.cc
index 168dbae..83b88f1 100644
--- a/proxy/hq/HQClientTransaction.cc
+++ b/proxy/hq/HQClientTransaction.cc
@@ -94,7 +94,7 @@ int
HQClientTransaction::state_stream_open(int event, void *edata)
{
// TODO: should check recursive call?
- HQTransDebug("%s", get_vc_event_name(event));
+ HQTransDebug("%s (%d)", get_vc_event_name(event), event);
switch (event) {
case VC_EVENT_READ_READY:
@@ -136,7 +136,7 @@ HQClientTransaction::state_stream_open(int event, void
*edata)
int
HQClientTransaction::state_stream_closed(int event, void *data)
{
- HQTransDebug("%s", get_vc_event_name(event));
+ HQTransDebug("%s (%d)", get_vc_event_name(event), event);
switch (event) {
case VC_EVENT_READ_READY:
@@ -318,7 +318,7 @@ HQClientTransaction::_signal_read_event()
this_ethread()->schedule_imm(this->_read_vio._cont, event,
&this->_read_vio);
}
- HQTransDebug("%s", get_vc_event_name(event));
+ HQTransDebug("%s (%d)", get_vc_event_name(event), event);
}
/**
@@ -339,7 +339,7 @@ HQClientTransaction::_signal_write_event()
this_ethread()->schedule_imm(this->_write_vio._cont, event,
&this->_write_vio);
}
- HQTransDebug("%s", get_vc_event_name(event));
+ HQTransDebug("%s (%d)", get_vc_event_name(event), event);
}
// Convert HTTP/0.9 to HTTP/1.1
diff --git a/proxy/hq/QUICSimpleApp.cc b/proxy/hq/QUICSimpleApp.cc
index 502a1d0..3002e76 100644
--- a/proxy/hq/QUICSimpleApp.cc
+++ b/proxy/hq/QUICSimpleApp.cc
@@ -55,7 +55,7 @@ QUICSimpleApp::~QUICSimpleApp()
int
QUICSimpleApp::main_event_handler(int event, Event *data)
{
- Debug(tag, "%s", get_vc_event_name(event));
+ Debug(tag, "%s (%d)", get_vc_event_name(event), event);
VIO *vio = reinterpret_cast<VIO *>(data);
QUICStreamIO *stream_io = this->_find_stream_io(vio);
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].
