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

nghttp: Record request time just before transmission of request

This commit is contained in:
Tatsuhiro Tsujikawa 2015-02-01 16:58:58 +09:00
parent e9eae3fb61
commit f321ee5a61
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nghttp.cc
View File

@ -811,6 +811,11 @@ int HttpClient::on_upgrade_connect() {
std::cout << " HTTP Upgrade request\n" << req << std::endl; std::cout << " HTTP Upgrade request\n" << req << std::endl;
} }
// record request time if this is GET request
if (!reqvec[0]->data_prd) {
reqvec[0]->record_request_time();
}
on_writefn = &HttpClient::noop; on_writefn = &HttpClient::noop;
signal_write(); signal_write();
@ -1249,8 +1254,6 @@ void HttpClient::record_dns_complete_time() {
void HttpClient::record_connect_time() { stat.on_connect_time = get_time(); } void HttpClient::record_connect_time() { stat.on_connect_time = get_time(); }
void HttpClient::on_request(Request *req) { void HttpClient::on_request(Request *req) {
req->record_request_time();
if (req->pri == 0 && req->dep) { if (req->pri == 0 && req->dep) {
assert(req->dep->deps.empty()); assert(req->dep->deps.empty());
@ -1634,6 +1637,7 @@ int on_begin_headers_callback(nghttp2_session *session,
nghttp2_session_set_stream_user_data(session, stream_id, req.get()); nghttp2_session_set_stream_user_data(session, stream_id, req.get());
client->on_request(req.get()); client->on_request(req.get());
req->record_request_time();
client->reqvec.push_back(std::move(req)); client->reqvec.push_back(std::move(req));
break; break;
@ -1815,6 +1819,21 @@ int on_frame_recv_callback2(nghttp2_session *session,
} }
} // namespace } // namespace
namespace {
int before_frame_send_callback(nghttp2_session *session,
const nghttp2_frame *frame, void *user_data) {
if (frame->hd.type != NGHTTP2_HEADERS ||
frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
return 0;
}
auto req = static_cast<Request *>(
nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
req->record_request_time();
return 0;
}
} // namespace
namespace { namespace {
int on_stream_close_callback(nghttp2_session *session, int32_t stream_id, int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
uint32_t error_code, void *user_data) { uint32_t error_code, void *user_data) {
@ -2109,6 +2128,9 @@ int run(char **uris, int n) {
nghttp2_session_callbacks_set_on_header_callback(callbacks, nghttp2_session_callbacks_set_on_header_callback(callbacks,
on_header_callback); on_header_callback);
nghttp2_session_callbacks_set_before_frame_send_callback(
callbacks, before_frame_send_callback);
nghttp2_session_callbacks_set_send_callback(callbacks, send_callback); nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
if (config.padding) { if (config.padding) {