You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2017/08/23 07:35:27 UTC
[trafficserver] branch quic-latest updated (6d538d4 -> 075d829)
This is an automated email from the ASF dual-hosted git repository.
masaori pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 6d538d4 Return QUICError from QUICFrameHandler::handle_frame()
new 0b58990 Remvoe duplicated mutex allocation
new 075d829 Cleanup QUICStreamManager
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:
iocore/net/QUICNetVConnection.cc | 1 -
iocore/net/quic/QUICStream.cc | 2 +-
iocore/net/quic/QUICStreamManager.cc | 18 +++++++++---------
iocore/net/quic/QUICStreamManager.h | 10 +++++-----
4 files changed, 15 insertions(+), 16 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 01/02: Remvoe duplicated mutex allocation
Posted by ma...@apache.org.
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
commit 0b589903df5f433fc44df2c408eb30428c13de99
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Aug 23 16:25:45 2017 +0900
Remvoe duplicated mutex allocation
---
iocore/net/QUICNetVConnection.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index f6343c3..3ec81cb 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -62,7 +62,6 @@ QUICNetVConnection::init(UDPConnection *udp_con, QUICPacketHandler *packet_handl
{
this->_transmitter_mutex = new_ProxyMutex();
this->_udp_con = udp_con;
- this->_transmitter_mutex = new_ProxyMutex();
this->_packet_handler = packet_handler;
this->_quic_connection_id.randomize();
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/02: Cleanup QUICStreamManager
Posted by ma...@apache.org.
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
commit 075d829b405800c70061797725a5584d378f48ab
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Aug 23 16:35:10 2017 +0900
Cleanup QUICStreamManager
---
iocore/net/quic/QUICStream.cc | 2 +-
iocore/net/quic/QUICStreamManager.cc | 18 +++++++++---------
iocore/net/quic/QUICStreamManager.h | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/iocore/net/quic/QUICStream.cc b/iocore/net/quic/QUICStream.cc
index 3623377..f559419 100644
--- a/iocore/net/quic/QUICStream.cc
+++ b/iocore/net/quic/QUICStream.cc
@@ -400,7 +400,7 @@ QUICStream::_send()
break;
}
this->_state.update_with_sent_frame(*frame);
- this->_streamManager->send_stream_frame(std::move(frame));
+ this->_streamManager->send_frame(std::move(frame));
}
return;
diff --git a/iocore/net/quic/QUICStreamManager.cc b/iocore/net/quic/QUICStreamManager.cc
index 6015f39..4ac3b94 100644
--- a/iocore/net/quic/QUICStreamManager.cc
+++ b/iocore/net/quic/QUICStreamManager.cc
@@ -68,7 +68,7 @@ QUICStreamManager::handle_frame(std::shared_ptr<const QUICFrame> frame)
switch (frame->type()) {
case QUICFrameType::MAX_DATA: {
- error = this->_handle_max_data_frame(std::dynamic_pointer_cast<const QUICMaxDataFrame>(frame));
+ error = this->_handle_frame(std::dynamic_pointer_cast<const QUICMaxDataFrame>(frame));
break;
}
case QUICFrameType::BLOCKED: {
@@ -76,15 +76,15 @@ QUICStreamManager::handle_frame(std::shared_ptr<const QUICFrame> frame)
break;
}
case QUICFrameType::MAX_STREAM_DATA: {
- error = this->_handle_max_stream_data_frame(std::dynamic_pointer_cast<const QUICMaxStreamDataFrame>(frame));
+ error = this->_handle_frame(std::dynamic_pointer_cast<const QUICMaxStreamDataFrame>(frame));
break;
}
case QUICFrameType::STREAM_BLOCKED: {
- error = this->_handle_stream_blocked_frame(std::dynamic_pointer_cast<const QUICStreamBlockedFrame>(frame));
+ error = this->_handle_frame(std::dynamic_pointer_cast<const QUICStreamBlockedFrame>(frame));
break;
}
case QUICFrameType::STREAM:
- error = this->_handle_stream_frame(std::dynamic_pointer_cast<const QUICStreamFrame>(frame));
+ error = this->_handle_frame(std::dynamic_pointer_cast<const QUICStreamFrame>(frame));
break;
default:
Debug(tag, "Unexpected frame type: %02x", static_cast<unsigned int>(frame->type()));
@@ -96,7 +96,7 @@ QUICStreamManager::handle_frame(std::shared_ptr<const QUICFrame> frame)
}
QUICError
-QUICStreamManager::_handle_max_data_frame(std::shared_ptr<const QUICMaxDataFrame> frame)
+QUICStreamManager::_handle_frame(std::shared_ptr<const QUICMaxDataFrame> frame)
{
this->_send_max_data = frame->maximum_data();
return QUICError(QUICErrorClass::NONE);
@@ -111,7 +111,7 @@ QUICStreamManager::slide_recv_max_data()
}
QUICError
-QUICStreamManager::_handle_max_stream_data_frame(std::shared_ptr<const QUICMaxStreamDataFrame> frame)
+QUICStreamManager::_handle_frame(std::shared_ptr<const QUICMaxStreamDataFrame> frame)
{
QUICStream *stream = this->_find_stream(frame->stream_id());
if (stream) {
@@ -124,7 +124,7 @@ QUICStreamManager::_handle_max_stream_data_frame(std::shared_ptr<const QUICMaxSt
}
QUICError
-QUICStreamManager::_handle_stream_blocked_frame(std::shared_ptr<const QUICStreamBlockedFrame> frame)
+QUICStreamManager::_handle_frame(std::shared_ptr<const QUICStreamBlockedFrame> frame)
{
QUICStream *stream = this->_find_stream(frame->stream_id());
if (stream) {
@@ -137,7 +137,7 @@ QUICStreamManager::_handle_stream_blocked_frame(std::shared_ptr<const QUICStream
}
QUICError
-QUICStreamManager::_handle_stream_frame(std::shared_ptr<const QUICStreamFrame> frame)
+QUICStreamManager::_handle_frame(std::shared_ptr<const QUICStreamFrame> frame)
{
QUICStream *stream = this->_find_or_create_stream(frame->stream_id());
QUICApplication *application = this->_app_map->get(frame->stream_id());
@@ -159,7 +159,7 @@ QUICStreamManager::_handle_stream_frame(std::shared_ptr<const QUICStreamFrame> f
* @brief Send stream frame
*/
void
-QUICStreamManager::send_stream_frame(std::unique_ptr<QUICStreamFrame, QUICFrameDeleterFunc> frame)
+QUICStreamManager::send_frame(std::unique_ptr<QUICStreamFrame, QUICFrameDeleterFunc> frame)
{
// XXX The offset of sending frame is always largest offset by sending side
if (frame->stream_id() != STREAM_ID_FOR_HANDSHAKE) {
diff --git a/iocore/net/quic/QUICStreamManager.h b/iocore/net/quic/QUICStreamManager.h
index 4abea4f..fbfc6e9 100644
--- a/iocore/net/quic/QUICStreamManager.h
+++ b/iocore/net/quic/QUICStreamManager.h
@@ -41,7 +41,7 @@ public:
virtual std::vector<QUICFrameType> interests() override;
virtual QUICError handle_frame(std::shared_ptr<const QUICFrame>) override;
virtual void send_frame(std::unique_ptr<QUICFrame, QUICFrameDeleterFunc> frame);
- void send_stream_frame(std::unique_ptr<QUICStreamFrame, QUICFrameDeleterFunc> frame);
+ virtual void send_frame(std::unique_ptr<QUICStreamFrame, QUICFrameDeleterFunc> frame);
virtual bool is_send_avail_more_than(uint64_t size);
virtual bool is_recv_avail_more_than(uint64_t size);
void add_recv_total_offset(uint64_t delta);
@@ -57,10 +57,10 @@ public:
private:
QUICStream *_find_or_create_stream(QUICStreamId stream_id);
QUICStream *_find_stream(QUICStreamId id);
- QUICError _handle_max_data_frame(std::shared_ptr<const QUICMaxDataFrame>);
- QUICError _handle_stream_frame(std::shared_ptr<const QUICStreamFrame>);
- QUICError _handle_max_stream_data_frame(std::shared_ptr<const QUICMaxStreamDataFrame>);
- QUICError _handle_stream_blocked_frame(std::shared_ptr<const QUICStreamBlockedFrame>);
+ QUICError _handle_frame(std::shared_ptr<const QUICMaxDataFrame>);
+ QUICError _handle_frame(std::shared_ptr<const QUICStreamFrame>);
+ QUICError _handle_frame(std::shared_ptr<const QUICMaxStreamDataFrame>);
+ QUICError _handle_frame(std::shared_ptr<const QUICStreamBlockedFrame>);
QUICApplicationMap *_app_map = nullptr;
QUICFrameTransmitter *_tx = nullptr;
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.