Skip to content

B
brpc
Commit ea0a56d7 authored by gejun's avatar gejun
Browse files
Options

Rename PROTOCOL_HTTP2 to PROTOCOL_H2 and replace http2 with h2 on variable names

parent 9cec466e
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
src/brpc/controller.cpp
View file @ ea0a56d7
......@@ -363,7 +363,7 @@ void Controller::AppendServerIdentiy() {
inline void UpdateResponseHeader(Controller* cntl) {
DCHECK(cntl->Failed());
if (cntl->request_protocol() == PROTOCOL_HTTP ||
cntl->request_protocol() == PROTOCOL_HTTP2) {
cntl->request_protocol() == PROTOCOL_H2) {
if (cntl->ErrorCode() != EHTTP) {
// Set the related status code
cntl->http_response().set_status_code(
......
src/brpc/global.cpp
View file @ ea0a56d7
......@@ -404,7 +404,7 @@ static void GlobalInitializeOrDieImpl() {
GetHttpMethodName,
CONNECTION_TYPE_SINGLE,
"h2" };
if (RegisterProtocol(PROTOCOL_HTTP2, http2_protocol) != 0) {
if (RegisterProtocol(PROTOCOL_H2, http2_protocol) != 0) {
exit(1);
}
......
src/brpc/options.proto
View file @ ea0a56d7
......@@ -46,7 +46,7 @@ enum ProtocolType {
// Reserve special protocol for cds-agent, which depends on FIFO right now
PROTOCOL_CDS_AGENT = 24; // Client side only
PROTOCOL_ESP = 25; // Client side only
PROTOCOL_HTTP2 = 26;
PROTOCOL_H2 = 26;
}
enum CompressType {
......
src/brpc/policy/http2_rpc_protocol.cpp
View file @ ea0a56d7
......@@ -30,31 +30,31 @@ DECLARE_bool(usercode_in_pthread);
namespace policy {
DEFINE_int32(http2_client_header_table_size,
DEFINE_int32(h2_client_header_table_size,
H2Settings::DEFAULT_HEADER_TABLE_SIZE,
"maximum size of compression tables for decoding headers");
DEFINE_int32(http2_client_stream_window_size, 256 * 1024,
DEFINE_int32(h2_client_stream_window_size, 256 * 1024,
"Initial window size for stream-level flow control");
DEFINE_int32(http2_client_connection_window_size, 1024 * 1024,
DEFINE_int32(h2_client_connection_window_size, 1024 * 1024,
"Initial window size for connection-level flow control");
DEFINE_int32(http2_client_max_frame_size,
DEFINE_int32(h2_client_max_frame_size,
H2Settings::DEFAULT_MAX_FRAME_SIZE,
"Size of the largest frame payload that client is willing to receive");
DEFINE_bool(http2_hpack_encode_name, false,
DEFINE_bool(h2_hpack_encode_name, false,
"Encode name in HTTP2 headers with huffman encoding");
DEFINE_bool(http2_hpack_encode_value, false,
DEFINE_bool(h2_hpack_encode_value, false,
"Encode value in HTTP2 headers with huffman encoding");
static bool CheckStreamWindowSize(const char*, int32_t val) {
return val >= 0;
}
BRPC_VALIDATE_GFLAG(http2_client_stream_window_size, CheckStreamWindowSize);
BRPC_VALIDATE_GFLAG(h2_client_stream_window_size, CheckStreamWindowSize);
static bool CheckConnWindowSize(const char*, int32_t val) {
return val >= (int32_t)H2Settings::DEFAULT_INITIAL_WINDOW_SIZE;
}
BRPC_VALIDATE_GFLAG(http2_client_connection_window_size, CheckConnWindowSize);
BRPC_VALIDATE_GFLAG(h2_client_connection_window_size, CheckConnWindowSize);
const char* H2StreamState2Str(H2StreamState s) {
switch (s) {
......@@ -141,12 +141,12 @@ inline void SerializeFrameHead(void* out_buf, const H2FrameHead& h) {
// [ https://tools.ietf.org/html/rfc7540#section-6.5.1 ]
enum H2SettingsIdentifier {
HTTP2_SETTINGS_HEADER_TABLE_SIZE = 0x1,
HTTP2_SETTINGS_ENABLE_PUSH = 0x2,
HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 0x3,
HTTP2_SETTINGS_STREAM_WINDOW_SIZE = 0x4,
HTTP2_SETTINGS_MAX_FRAME_SIZE = 0x5,
HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x6
H2_SETTINGS_HEADER_TABLE_SIZE = 0x1,
H2_SETTINGS_ENABLE_PUSH = 0x2,
H2_SETTINGS_MAX_CONCURRENT_STREAMS = 0x3,
H2_SETTINGS_STREAM_WINDOW_SIZE = 0x4,
H2_SETTINGS_MAX_FRAME_SIZE = 0x5,
H2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x6
};
// Parse from n bytes from the iterator.
......@@ -161,27 +161,27 @@ bool ParseH2Settings(H2Settings* out, butil::IOBufBytesIterator& it, size_t n) {
uint16_t id = LoadUint16(it);
uint32_t value = LoadUint32(it);
switch (static_cast<H2SettingsIdentifier>(id)) {
case HTTP2_SETTINGS_HEADER_TABLE_SIZE:
case H2_SETTINGS_HEADER_TABLE_SIZE:
out->header_table_size = value;
break;
case HTTP2_SETTINGS_ENABLE_PUSH:
case H2_SETTINGS_ENABLE_PUSH:
if (value > 1) {
LOG(ERROR) << "Invalid value=" << value << " for ENABLE_PUSH";
return false;
}
out->enable_push = value;
break;
case HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
case H2_SETTINGS_MAX_CONCURRENT_STREAMS:
out->max_concurrent_streams = value;
break;
case HTTP2_SETTINGS_STREAM_WINDOW_SIZE:
case H2_SETTINGS_STREAM_WINDOW_SIZE:
if (value > H2Settings::MAX_WINDOW_SIZE) {
LOG(ERROR) << "Invalid stream_window_size=" << value;
return false;
}
out->stream_window_size = value;
break;
case HTTP2_SETTINGS_MAX_FRAME_SIZE:
case H2_SETTINGS_MAX_FRAME_SIZE:
if (value > H2Settings::MAX_OF_MAX_FRAME_SIZE ||
value < H2Settings::DEFAULT_MAX_FRAME_SIZE) {
LOG(ERROR) << "Invalid max_frame_size=" << value;
......@@ -189,7 +189,7 @@ bool ParseH2Settings(H2Settings* out, butil::IOBufBytesIterator& it, size_t n) {
}
out->max_frame_size = value;
break;
case HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
case H2_SETTINGS_MAX_HEADER_LIST_SIZE:
out->max_header_list_size = value;
break;
default:
......@@ -210,32 +210,32 @@ static const size_t H2_SETTINGS_MAX_BYTE_SIZE = 36;
size_t SerializeH2Settings(const H2Settings& in, void* out) {
uint8_t* p = (uint8_t*)out;
if (in.header_table_size != H2Settings::DEFAULT_HEADER_TABLE_SIZE) {
SaveUint16(p, HTTP2_SETTINGS_HEADER_TABLE_SIZE);
SaveUint16(p, H2_SETTINGS_HEADER_TABLE_SIZE);
SaveUint32(p + 2, in.header_table_size);
p += 6;
}
if (in.enable_push != H2Settings::DEFAULT_ENABLE_PUSH) {
SaveUint16(p, HTTP2_SETTINGS_ENABLE_PUSH);
SaveUint16(p, H2_SETTINGS_ENABLE_PUSH);
SaveUint32(p + 2, in.enable_push);
p += 6;
}
if (in.max_concurrent_streams != std::numeric_limits<uint32_t>::max()) {
SaveUint16(p, HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS);
SaveUint16(p, H2_SETTINGS_MAX_CONCURRENT_STREAMS);
SaveUint32(p + 2, in.max_concurrent_streams);
p += 6;
}
if (in.stream_window_size != H2Settings::DEFAULT_INITIAL_WINDOW_SIZE) {
SaveUint16(p, HTTP2_SETTINGS_STREAM_WINDOW_SIZE);
SaveUint16(p, H2_SETTINGS_STREAM_WINDOW_SIZE);
SaveUint32(p + 2, in.stream_window_size);
p += 6;
}
if (in.max_frame_size != H2Settings::DEFAULT_MAX_FRAME_SIZE) {
SaveUint16(p, HTTP2_SETTINGS_MAX_FRAME_SIZE);
SaveUint16(p, H2_SETTINGS_MAX_FRAME_SIZE);
SaveUint32(p + 2, in.max_frame_size);
p += 6;
}
if (in.max_header_list_size != std::numeric_limits<uint32_t>::max()) {
SaveUint16(p, HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE);
SaveUint16(p, H2_SETTINGS_MAX_HEADER_LIST_SIZE);
SaveUint32(p + 2, in.max_header_list_size);
p += 6;
}
......@@ -326,10 +326,10 @@ H2Context::H2Context(Socket* socket, const Server* server)
if (server) {
_unack_local_settings = server->options().h2_settings;
} else {
_unack_local_settings.header_table_size = FLAGS_http2_client_header_table_size;
_unack_local_settings.stream_window_size = FLAGS_http2_client_stream_window_size;
_unack_local_settings.max_frame_size = FLAGS_http2_client_max_frame_size;
_unack_local_settings.connection_window_size = FLAGS_http2_client_connection_window_size;
_unack_local_settings.header_table_size = FLAGS_h2_client_header_table_size;
_unack_local_settings.stream_window_size = FLAGS_h2_client_stream_window_size;
_unack_local_settings.max_frame_size = FLAGS_h2_client_max_frame_size;
_unack_local_settings.connection_window_size = FLAGS_h2_client_connection_window_size;
}
#if defined(UNIT_TEST)
// In ut, we hope _last_client_stream_id run out quickly to test the correctness
......@@ -1134,7 +1134,7 @@ H2StreamContext::H2StreamContext(bool read_body_progressively)
, _correlation_id(INVALID_BTHREAD_ID.value) {
header().set_version(2, 0);
#ifndef NDEBUG
get_http2_bvars()->h2_stream_context_count << 1;
get_h2_bvars()->h2_stream_context_count << 1;
#endif
}
......@@ -1147,7 +1147,7 @@ void H2StreamContext::Init(H2Context* conn_ctx, int stream_id) {
H2StreamContext::~H2StreamContext() {
#ifndef NDEBUG
get_http2_bvars()->h2_stream_context_count << -1;
get_h2_bvars()->h2_stream_context_count << -1;
#endif
}
......@@ -1535,8 +1535,8 @@ H2UnsentRequest::AppendAndDestroySelf(butil::IOBuf* out, Socket* socket) {
HPacker& hpacker = ctx->hpacker();
butil::IOBufAppender appender;
HPackOptions options;
options.encode_name = FLAGS_http2_hpack_encode_name;
options.encode_value = FLAGS_http2_hpack_encode_value;
options.encode_name = FLAGS_h2_hpack_encode_name;
options.encode_value = FLAGS_h2_hpack_encode_value;
for (size_t i = 0; i < _size; ++i) {
hpacker.Encode(&appender, _list[i], options);
}
......@@ -1669,8 +1669,8 @@ H2UnsentResponse::AppendAndDestroySelf(butil::IOBuf* out, Socket* socket) {
HPacker& hpacker = ctx->hpacker();
butil::IOBufAppender appender;
HPackOptions options;
options.encode_name = FLAGS_http2_hpack_encode_name;
options.encode_value = FLAGS_http2_hpack_encode_value;
options.encode_name = FLAGS_h2_hpack_encode_name;
options.encode_value = FLAGS_h2_hpack_encode_value;
for (size_t i = 0; i < _size; ++i) {
hpacker.Encode(&appender, _list[i], options);
......
src/brpc/policy/http2_rpc_protocol.h
View file @ ea0a56d7
......@@ -115,17 +115,17 @@ enum H2StreamState {
const char* H2StreamState2Str(H2StreamState);
#ifndef NDEBUG
struct Http2Bvars {
struct H2Bvars {
bvar::Adder<int> h2_unsent_request_count;
bvar::Adder<int> h2_stream_context_count;
Http2Bvars()
H2Bvars()
: h2_unsent_request_count("h2_unsent_request_count")
, h2_stream_context_count("h2_stream_context_count") {
}
};
inline Http2Bvars* get_http2_bvars() {
return butil::get_leaky_singleton<Http2Bvars>();
inline H2Bvars* get_h2_bvars() {
return butil::get_leaky_singleton<H2Bvars>();
}
#endif
......@@ -170,12 +170,12 @@ private:
, _stream_id(0)
, _cntl(c) {
#ifndef NDEBUG
get_http2_bvars()->h2_unsent_request_count << 1;
get_h2_bvars()->h2_unsent_request_count << 1;
#endif
}
~H2UnsentRequest() {
#ifndef NDEBUG
get_http2_bvars()->h2_unsent_request_count << -1;
get_h2_bvars()->h2_unsent_request_count << -1;
#endif
}
H2UnsentRequest(const H2UnsentRequest&);
......@@ -417,7 +417,7 @@ inline std::ostream& operator<<(std::ostream& os, const H2UnsentResponse& res) {
return os;
}
} // namespace policy
} // namespace policy
} // namespace brpc
#endif // BAIDU_RPC_POLICY_HTTP2_RPC_PROTOCOL_H
src/brpc/policy/http_rpc_protocol.cpp
View file @ ea0a56d7
......@@ -251,8 +251,8 @@ void ProcessHttpResponse(InputMessageBase* msg) {
uint64_t cid_value;
const bool is_http2 = imsg_guard->header().is_http2();
if (is_http2) {
H2StreamContext* http2_sctx = static_cast<H2StreamContext*>(msg);
cid_value = http2_sctx->correlation_id();
H2StreamContext* h2_sctx = static_cast<H2StreamContext*>(msg);
cid_value = h2_sctx->correlation_id();
} else {
cid_value = socket->correlation_id();
}
......@@ -450,7 +450,7 @@ void SerializeHttpRequest(butil::IOBuf* /*not used*/,
Controller* cntl,
const google::protobuf::Message* pbreq) {
HttpHeader& hreq = cntl->http_request();
const bool is_http2 = (cntl->request_protocol() == PROTOCOL_HTTP2);
const bool is_http2 = (cntl->request_protocol() == PROTOCOL_H2);
bool is_grpc = false;
ControllerPrivateAccessor accessor(cntl);
if (!accessor.protocol_param().empty() && hreq.content_type().empty()) {
......@@ -1208,8 +1208,8 @@ void ProcessHttpRequest(InputMessageBase *msg) {
const bool is_http2 = imsg_guard->header().is_http2();
if (is_http2) {
H2StreamContext* http2_sctx = static_cast<H2StreamContext*>(msg);
resp_sender.set_h2_stream_id(http2_sctx->stream_id());
H2StreamContext* h2_sctx = static_cast<H2StreamContext*>(msg);
resp_sender.set_h2_stream_id(h2_sctx->stream_id());
}
ControllerPrivateAccessor accessor(cntl);
......@@ -1280,7 +1280,7 @@ void ProcessHttpRequest(InputMessageBase *msg) {
span->set_remote_side(user_addr);
span->set_received_us(msg->received_us());
span->set_start_parse_us(start_parse_us);
span->set_protocol(is_http2 ? PROTOCOL_HTTP2 : PROTOCOL_HTTP);
span->set_protocol(is_http2 ? PROTOCOL_H2 : PROTOCOL_HTTP);
span->set_request_size(imsg_guard->parsed_length());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment