[trafficserver] branch master updated: Group boolean members to reduce alignment padding.
This is an automated email from the ASF dual-hosted git repository. jpeach pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5fd32b1 Group boolean members to reduce alignment padding. 5fd32b1 is described below commit 5fd32b1ec638ea81aac1b3637506d50b1b3dfd1c Author: James PeachAuthorDate: Tue Aug 9 15:52:36 2016 -0700 Group boolean members to reduce alignment padding. --- proxy/http2/Http2Stream.cc | 2 +- proxy/http2/Http2Stream.h | 15 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc index 9d878d8..2fc73c4 100644 --- a/proxy/http2/Http2Stream.cc +++ b/proxy/http2/Http2Stream.cc @@ -594,7 +594,7 @@ Http2Stream::reenable(VIO *vio) void Http2Stream::destroy() { - Debug("http2_stream", "Destroy stream %d. Sent %d bytes", this->_id, this->bytes_sent); + Debug("http2_stream", "Destroy stream %d, sent %" PRIu64 " bytes", this->_id, this->bytes_sent); // Clean up the write VIO in case of inactivity timeout this->do_io_write(NULL, 0, NULL); diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h index 31abc8f..2a8eff8 100644 --- a/proxy/http2/Http2Stream.h +++ b/proxy/http2/Http2Stream.h @@ -59,11 +59,11 @@ public: _state(HTTP2_STREAM_STATE_IDLE), trailing_header(false), body_done(false), - data_length(0), closed(false), sent_delete(false), - bytes_sent(0), chunked(false), + data_length(0), + bytes_sent(0), cross_thread_event(NULL), active_timeout(0), active_event(NULL), @@ -110,7 +110,7 @@ public: } void - update_sent_count(int num_bytes) + update_sent_count(unsigned num_bytes) { bytes_sent += num_bytes; } @@ -246,14 +246,17 @@ private: HTTPHdr _req_header; VIO read_vio; VIO write_vio; + bool trailing_header; bool body_done; - uint64_t data_length; bool closed; bool sent_delete; - int bytes_sent; - ChunkedHandler chunked_handler; bool chunked; + + uint64_t data_length; + uint64_t bytes_sent; + + ChunkedHandler chunked_handler; Event *cross_thread_event; // Support stream-specific timeouts -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org" '].
[trafficserver] branch master updated: Minor style and vertical whitespace fixes.
This is an automated email from the ASF dual-hosted git repository. jpeach pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 0d2fcc1 Minor style and vertical whitespace fixes. 0d2fcc1 is described below commit 0d2fcc15162b379f3340679a22bfc5bf61358da2 Author: James PeachAuthorDate: Tue Aug 9 15:38:01 2016 -0700 Minor style and vertical whitespace fixes. --- proxy/http2/Http2Stream.cc | 12 ++-- proxy/http2/Http2Stream.h | 6 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc index 7a228ff..9d878d8 100644 --- a/proxy/http2/Http2Stream.cc +++ b/proxy/http2/Http2Stream.cc @@ -58,6 +58,7 @@ Http2Stream::main_event_handler(int event, void *edata) } else if (e == write_event) { write_event = NULL; } + switch (event) { case VC_EVENT_ACTIVE_TIMEOUT: case VC_EVENT_INACTIVITY_TIMEOUT: @@ -119,6 +120,7 @@ Http2Stream::main_event_handler(int event, void *edata) break; } } + return 0; } @@ -379,18 +381,19 @@ Http2Stream::initiating_close() /* Replace existing event only if the new event is different than the inprogress event */ Event * -Http2Stream::send_tracked_event(Event *in_event, int send_event, VIO *vio) +Http2Stream::send_tracked_event(Event *event, int send_event, VIO *vio) { - Event *event = in_event; if (event != NULL) { if (event->callback_event != send_event) { event->cancel(); event = NULL; } } + if (event == NULL) { event = this_ethread()->schedule_imm(this, send_event, vio); } + return event; } @@ -486,6 +489,7 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len, total_added += bytes_added; } } + bool is_done = (this->response_process_data()); if (total_added > 0 || is_done) { write_vio.ndone += total_added; @@ -556,6 +560,7 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len, Debug("http2_stream", "write update stream_id=%d event=%d", this->get_id(), send_event); } + return retval; } @@ -626,6 +631,7 @@ check_stream_thread(Continuation *cont) return true; } } + bool check_continuation(Continuation *cont) { @@ -724,6 +730,7 @@ Http2Stream::clear_inactive_timer() inactive_event = NULL; } } + void Http2Stream::clear_active_timer() { @@ -732,6 +739,7 @@ Http2Stream::clear_active_timer() active_event = NULL; } } + void Http2Stream::clear_timers() { diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h index 51e495a..31abc8f 100644 --- a/proxy/http2/Http2Stream.h +++ b/proxy/http2/Http2Stream.h @@ -102,6 +102,7 @@ public: { return body_done; } + void mark_body_done() { @@ -119,11 +120,13 @@ public: { return _id; } + const Http2StreamState get_state() const { return _state; } + bool change_state(uint8_t type, uint8_t flags); void @@ -131,6 +134,7 @@ public: { _id = sid; } + void update_initial_rwnd(Http2WindowSize new_size) { @@ -156,6 +160,7 @@ public: { data_length += length; } + bool payload_length_is_valid() const { @@ -209,6 +214,7 @@ public: { return chunked; } + bool response_initialize_data_handling(); bool response_process_data(); bool response_is_data_available() const; -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org" '].
[trafficserver] branch master updated: Fix kqueue debug log spelling.
This is an automated email from the ASF dual-hosted git repository. jpeach pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new e47721f Fix kqueue debug log spelling. e47721f is described below commit e47721f88f7c4d6ba546657db30b97a2a4d2a2f7 Author: James PeachAuthorDate: Tue Aug 9 15:11:29 2016 -0700 Fix kqueue debug log spelling. --- iocore/net/UnixNet.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc index 9d8ede0..c8580e5 100644 --- a/iocore/net/UnixNet.cc +++ b/iocore/net/UnixNet.cc @@ -194,7 +194,7 @@ PollCont::pollEvent(int event, Event *e) tv.tv_nsec = 100 * (poll_timeout % 1000); pollDescriptor->result = kevent(pollDescriptor->kqueue_fd, NULL, 0, pollDescriptor->kq_Triggered_Events, POLL_DESCRIPTOR_SIZE, ); - NetDebug("iocore_net_poll", "[PollCont::pollEvent] kueue_fd: %d, timeout: %d, results: %d", pollDescriptor->kqueue_fd, + NetDebug("iocore_net_poll", "[PollCont::pollEvent] kqueue_fd: %d, timeout: %d, results: %d", pollDescriptor->kqueue_fd, poll_timeout, pollDescriptor->result); #elif TS_USE_PORT int retval; -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org" '].
[trafficserver] branch master updated (2db110f -> 9669782)
This is an automated email from the ASF dual-hosted git repository. shinrich pushed a change to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git. from 2db110f Merge pull request #830 from masaori335/ts-4554 adds 8a7c8fc TS-4717: Http2 stack explosion. new 9669782 Merge pull request #842 from shinrich/ts-4717 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: iocore/net/UnixNetVConnection.cc | 4 +- proxy/ProxyClientSession.h| 6 ++ proxy/http2/Http2ClientSession.cc | 148 ++ proxy/http2/Http2ClientSession.h | 6 ++ 4 files changed, 99 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org"'].
[trafficserver] 01/01: Merge pull request #842 from shinrich/ts-4717
This is an automated email from the ASF dual-hosted git repository. shinrich pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git commit 966978222eb1ba9aa7ee24baa6657eb565bdd2b7 Merge: 2db110f 8a7c8fc Author: Susan HinrichsAuthorDate: Tue Aug 9 17:03:31 2016 -0500 Merge pull request #842 from shinrich/ts-4717 TS-4717: Http2 stack explosion. iocore/net/UnixNetVConnection.cc | 4 +- proxy/ProxyClientSession.h| 6 ++ proxy/http2/Http2ClientSession.cc | 148 ++ proxy/http2/Http2ClientSession.h | 6 ++ 4 files changed, 99 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" .
[trafficserver] branch master updated (bf82d9f -> 2db110f)
This is an automated email from the ASF dual-hosted git repository. masaori pushed a change to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git. from bf82d9f Merge pull request #838 from masaori335/ts-4713 adds c71fa8c TS-4554: Add some limitations in Http2DependencyTree new 2db110f Merge pull request #830 from masaori335/ts-4554 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: proxy/http2/Http2ConnectionState.cc | 27 ++-- proxy/http2/Http2ConnectionState.h | 8 +- proxy/http2/Http2DependencyTree.h | 59 - proxy/http2/test_Http2DependencyTree.cc | 211 ++-- 4 files changed, 279 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org"'].
[trafficserver] 01/01: Merge pull request #830 from masaori335/ts-4554
This is an automated email from the ASF dual-hosted git repository. masaori pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git commit 2db110fa56de0158c95f683fdac12d496a8935b0 Merge: bf82d9f c71fa8c Author: Masaori KoshibaAuthorDate: Tue Aug 9 18:08:35 2016 +0900 Merge pull request #830 from masaori335/ts-4554 TS-4554: Add some limitations in Http2DependencyTree proxy/http2/Http2ConnectionState.cc | 27 ++-- proxy/http2/Http2ConnectionState.h | 8 +- proxy/http2/Http2DependencyTree.h | 59 - proxy/http2/test_Http2DependencyTree.cc | 211 ++-- 4 files changed, 279 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" .