walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Remove backend priority handling code 

Currently, this does not do anything useful.
This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-15 00:09:53 +09:00
parent 698f00596d
commit f8472f4709
13 changed files with 23 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shrpx_downstream.cc
View File

@ -112,12 +112,12 @@ void downstream_wtimeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
// upstream could be nullptr for unittests
Downstream::Downstream(Upstream *upstream, MemchunkPool *mcpool,
int32_t stream_id, int32_t priority)
int32_t stream_id)
: dlnext(nullptr), dlprev(nullptr), response_sent_body_length(0),
request_start_time_(std::chrono::high_resolution_clock::now()),
request_buf_(mcpool), response_buf_(mcpool), upstream_(upstream),
blocked_link_(nullptr), num_retry_(0), stream_id_(stream_id),
priority_(priority), downstream_stream_id_(-1),
downstream_stream_id_(-1),
response_rst_stream_error_code_(NGHTTP2_NO_ERROR),
request_state_(INITIAL), response_state_(INITIAL),
dispatch_state_(DISPATCH_NONE), upgraded_(false), chunked_request_(false),
@ -604,14 +604,6 @@ int Downstream::on_read() {
return dconn_->on_read();
}
int Downstream::change_priority(int32_t pri) {
if (!dconn_) {
DLOG(INFO, this) << "dconn_ is NULL";
return -1;
}
return dconn_->on_priority_change(pri);
}
void Downstream::set_response_state(int state) { response_state_ = state; }
int Downstream::get_response_state() const { return response_state_; }
@ -661,10 +653,6 @@ bool Downstream::validate_response_recv_body_length() const {
return true;
}
void Downstream::set_priority(int32_t pri) { priority_ = pri; }
int32_t Downstream::get_priority() const { return priority_; }
void Downstream::check_upgrade_fulfilled() {
if (req_.method == HTTP_CONNECT) {
upgraded_ = 200 <= resp_.http_status && resp_.http_status < 300;

14
src/shrpx_downstream.h
View File

@ -191,15 +191,12 @@ struct Response {
class Downstream {
public:
Downstream(Upstream *upstream, MemchunkPool *mcpool, int32_t stream_id,
int32_t priority);
Downstream(Upstream *upstream, MemchunkPool *mcpool, int32_t stream_id);
~Downstream();
void reset_upstream(Upstream *upstream);
Upstream *get_upstream() const;
void set_stream_id(int32_t stream_id);
int32_t get_stream_id() const;
void set_priority(int32_t pri);
int32_t get_priority() const;
void pause_read(IOCtrlReason reason);
int resume_read(IOCtrlReason reason, size_t consumed);
void force_resume_read();
@ -316,12 +313,6 @@ public:
// connection.
int on_read();
// Change the priority of downstream
int change_priority(int32_t pri);
bool get_rst_stream_after_end_stream() const;
void set_rst_stream_after_end_stream(bool f);
// Resets upstream read timer. If it is active, timeout value is
// reset. If it is not active, timer will be started.
void reset_upstream_rtimer();
@ -411,9 +402,6 @@ private:
size_t num_retry_;
// The stream ID in frontend connection
int32_t stream_id_;
// The priority value in frontend connection, currently not used in
// a meaningful way.
int32_t priority_;
// stream ID in backend connection
int32_t downstream_stream_id_;
// RST_STREAM error_code from downstream HTTP2 connection

1
src/shrpx_downstream_connection.h
View File

@ -56,7 +56,6 @@ public:
virtual int on_timeout() { return 0; }
virtual void on_upstream_change(Upstream *uptream) = 0;
virtual int on_priority_change(int32_t pri) = 0;
virtual size_t get_group() const = 0;
// true if this object is poolable.

8
src/shrpx_downstream_test.cc
View File

@ -72,7 +72,7 @@ void test_downstream_field_store_header(void) {
}
void test_downstream_crumble_request_cookie(void) {
Downstream d(nullptr, nullptr, 0, 0);
Downstream d(nullptr, nullptr, 0);
auto &req = d.request();
req.fs.add_header(":method", "get");
req.fs.add_header(":path", "/");
@ -112,7 +112,7 @@ void test_downstream_crumble_request_cookie(void) {
}
void test_downstream_assemble_request_cookie(void) {
Downstream d(nullptr, nullptr, 0, 0);
Downstream d(nullptr, nullptr, 0);
auto &req = d.request();
req.fs.add_header(":method", "get");
req.fs.add_header(":path", "/");
@ -125,7 +125,7 @@ void test_downstream_assemble_request_cookie(void) {
void test_downstream_rewrite_location_response_header(void) {
{
Downstream d(nullptr, nullptr, 0, 0);
Downstream d(nullptr, nullptr, 0);
auto &req = d.request();
auto &resp = d.response();
d.set_request_downstream_host("localhost:3000");
@ -138,7 +138,7 @@ void test_downstream_rewrite_location_response_header(void) {
CU_ASSERT("https://localhost/" == (*location).value);
}
{
Downstream d(nullptr, nullptr, 0, 0);
Downstream d(nullptr, nullptr, 0);
auto &req = d.request();
auto &resp = d.response();
d.set_request_downstream_host("localhost");

24
src/shrpx_http2_downstream_connection.cc
View File

@ -390,11 +390,9 @@ int Http2DownstreamConnection::push_request_headers() {
nghttp2_data_provider data_prd;
data_prd.source.ptr = this;
data_prd.read_callback = http2_data_read_callback;
rv = http2session_->submit_request(this, downstream_->get_priority(),
nva.data(), nva.size(), &data_prd);
rv = http2session_->submit_request(this, nva.data(), nva.size(), &data_prd);
} else {
rv = http2session_->submit_request(this, downstream_->get_priority(),
nva.data(), nva.size(), nullptr);
rv = http2session_->submit_request(this, nva.data(), nva.size(), nullptr);
}
if (rv != 0) {
DCLOG(FATAL, this) << "nghttp2_submit_request() failed";
@ -496,24 +494,6 @@ StreamData *Http2DownstreamConnection::detach_stream_data() {
return nullptr;
}
int Http2DownstreamConnection::on_priority_change(int32_t pri) {
int rv;
if (downstream_->get_priority() == pri) {
return 0;
}
downstream_->set_priority(pri);
if (http2session_->get_state() != Http2Session::CONNECTED) {
return 0;
}
rv = http2session_->submit_priority(this, pri);
if (rv != 0) {
DLOG(FATAL, this) << "nghttp2_submit_priority() failed";
return -1;
}
http2session_->signal_write();
return 0;
}
int Http2DownstreamConnection::on_timeout() {
if (!downstream_) {
return 0;

1
src/shrpx_http2_downstream_connection.h
View File

@ -60,7 +60,6 @@ public:
virtual int on_timeout();
virtual void on_upstream_change(Upstream *upstream) {}
virtual int on_priority_change(int32_t pri);
virtual size_t get_group() const;
// This object is not poolable because we dont' have facility to

26
src/shrpx_http2_session.cc
View File

@ -567,7 +567,7 @@ void Http2Session::remove_stream_data(StreamData *sd) {
delete sd;
}
int Http2Session::submit_request(Http2DownstreamConnection *dconn, int32_t pri,
int Http2Session::submit_request(Http2DownstreamConnection *dconn,
const nghttp2_nv *nva, size_t nvlen,
const nghttp2_data_provider *data_prd) {
assert(state_ == CONNECTED);
@ -605,30 +605,6 @@ int Http2Session::submit_rst_stream(int32_t stream_id, uint32_t error_code) {
return 0;
}
int Http2Session::submit_priority(Http2DownstreamConnection *dconn,
int32_t pri) {
assert(state_ == CONNECTED);
if (!dconn) {
return 0;
}
int rv;
// TODO Disabled temporarily
// rv = nghttp2_submit_priority(session_, NGHTTP2_FLAG_NONE,
// dconn->get_downstream()->
// get_downstream_stream_id(), pri);
rv = 0;
if (rv < NGHTTP2_ERR_FATAL) {
SSLOG(FATAL, this) << "nghttp2_submit_priority() failed: "
<< nghttp2_strerror(rv);
return -1;
}
return 0;
}
nghttp2_session *Http2Session::get_session() const { return session_; }
bool Http2Session::get_flow_control() const { return flow_control_; }

7
src/shrpx_http2_session.h
View File

@ -74,14 +74,11 @@ public:
void remove_stream_data(StreamData *sd);
int submit_request(Http2DownstreamConnection *dconn, int32_t pri,
const nghttp2_nv *nva, size_t nvlen,
const nghttp2_data_provider *data_prd);
int submit_request(Http2DownstreamConnection *dconn, const nghttp2_nv *nva,
size_t nvlen, const nghttp2_data_provider *data_prd);
int submit_rst_stream(int32_t stream_id, uint32_t error_code);
int submit_priority(Http2DownstreamConnection *dconn, int32_t pri);
int terminate_session(uint32_t error_code);
nghttp2_session *get_session() const;

8
src/shrpx_http2_upstream.cc
View File

@ -127,7 +127,6 @@ int Http2Upstream::upgrade_upstream(HttpsUpstream *http) {
downstream->set_stream_id(1);
downstream->reset_upstream_rtimer();
downstream->set_stream_id(1);
downstream->set_priority(0);
auto ptr = downstream.get();
@ -226,9 +225,8 @@ int on_begin_headers_callback(nghttp2_session *session,
auto handler = upstream->get_client_handler();
// TODO Use priority 0 for now
auto downstream = make_unique<Downstream>(upstream, handler->get_mcpool(),
frame->hd.stream_id, 0);
frame->hd.stream_id);
nghttp2_session_set_stream_user_data(session, frame->hd.stream_id,
downstream.get());
@ -553,7 +551,7 @@ int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
}
auto downstream = make_unique<Downstream>(upstream, handler->get_mcpool(),
promised_stream_id, 0);
promised_stream_id);
auto &req = downstream->request();
// As long as we use nghttp2_session_mem_send(), setting stream
@ -1953,7 +1951,7 @@ Http2Upstream::on_downstream_push_promise(Downstream *downstream,
// promised_stream_id is for backend HTTP/2 session, not for
// frontend.
auto promised_downstream =
make_unique<Downstream>(this, handler_->get_mcpool(), 0, 0);
make_unique<Downstream>(this, handler_->get_mcpool(), 0);
auto &promised_req = promised_downstream->request();
promised_downstream->set_downstream_stream_id(promised_stream_id);

1
src/shrpx_http_downstream_connection.h
View File

@ -57,7 +57,6 @@ public:
virtual int on_write();
virtual void on_upstream_change(Upstream *upstream);
virtual int on_priority_change(int32_t pri) { return 0; }
virtual size_t get_group() const;
virtual bool poolable() const { return true; }

7
src/shrpx_https_upstream.cc
View File

@ -71,9 +71,7 @@ int htp_msg_begin(http_parser *htp) {
auto handler = upstream->get_client_handler();
// TODO specify 0 as priority for now
auto downstream =
make_unique<Downstream>(upstream, handler->get_mcpool(), 0, 0);
auto downstream = make_unique<Downstream>(upstream, handler->get_mcpool(), 0);
upstream->attach_downstream(std::move(downstream));
@ -810,8 +808,7 @@ void HttpsUpstream::error_reply(unsigned int status_code) {
auto downstream = get_downstream();
if (!downstream) {
attach_downstream(
make_unique<Downstream>(this, handler_->get_mcpool(), 1, 1));
attach_downstream(make_unique<Downstream>(this, handler_->get_mcpool(), 1));
downstream = get_downstream();
}

11
src/shrpx_spdy_upstream.cc
View File

@ -146,8 +146,8 @@ void on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type,
<< frame->syn_stream.stream_id;
}
auto downstream = upstream->add_pending_downstream(
frame->syn_stream.stream_id, frame->syn_stream.pri);
auto downstream =
upstream->add_pending_downstream(frame->syn_stream.stream_id);
auto &req = downstream->request();
@ -913,10 +913,9 @@ int SpdyUpstream::error_reply(Downstream *downstream,
return 0;
}
Downstream *SpdyUpstream::add_pending_downstream(int32_t stream_id,
int32_t priority) {
auto downstream = make_unique<Downstream>(this, handler_->get_mcpool(),
stream_id, priority);
Downstream *SpdyUpstream::add_pending_downstream(int32_t stream_id) {
auto downstream =
make_unique<Downstream>(this, handler_->get_mcpool(), stream_id);
spdylay_session_set_stream_user_data(session_, stream_id, downstream.get());
auto res = downstream.get();

2
src/shrpx_spdy_upstream.h
View File

@ -56,7 +56,7 @@ public:
virtual int downstream_write(DownstreamConnection *dconn);
virtual int downstream_eof(DownstreamConnection *dconn);
virtual int downstream_error(DownstreamConnection *dconn, int events);
Downstream *add_pending_downstream(int32_t stream_id, int32_t priority);
Downstream *add_pending_downstream(int32_t stream_id);
void remove_downstream(Downstream *downstream);
int rst_stream(Downstream *downstream, int status_code);