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

nghttp: Use nghttp2_session_mem_recv and nghttp2_session_mem_send

This commit is contained in:
Tatsuhiro Tsujikawa 2014-02-19 23:12:32 +09:00
parent cdf5d5402b
commit 1e1e77ad5e
1 changed files with 43 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/nghttp.cc
View File

@ -782,72 +782,55 @@ struct HttpClient {
int on_read() int on_read()
{ {
int rv = 0; int rv;
if((rv = nghttp2_session_recv(session)) < 0) { auto input = bufferevent_get_input(bev);
if(rv != NGHTTP2_ERR_EOF) { auto inputlen = evbuffer_get_length(input);
std::cerr << "nghttp2_session_recv() returned error: " auto mem = evbuffer_pullup(input, -1);
<< nghttp2_strerror(rv) << std::endl;
} rv = nghttp2_session_mem_recv(session, mem, inputlen);
} else if((rv = nghttp2_session_send(session)) < 0) { if(rv < 0) {
std::cerr << "nghttp2_session_send() returned error: " std::cerr << "nghttp2_session_mem_recv() returned error: "
<< nghttp2_strerror(rv) << std::endl; << nghttp2_strerror(rv) << std::endl;
return -1;
} }
if(rv == 0) { evbuffer_drain(input, rv);
if(nghttp2_session_want_read(session) == 0 &&
nghttp2_session_want_write(session) == 0 && return on_write();
evbuffer_get_length(bufferevent_get_output(bev)) == 0) {
rv = -1;
}
}
return rv;
} }
int on_write() int on_write()
{
int rv = 0;
if((rv = nghttp2_session_send(session)) < 0) {
std::cerr << "nghttp2_session_send() returned error: "
<< nghttp2_strerror(rv) << std::endl;
}
if(rv == 0) {
if(nghttp2_session_want_read(session) == 0 &&
nghttp2_session_want_write(session) == 0 &&
evbuffer_get_length(bufferevent_get_output(bev)) == 0) {
rv = -1;
}
}
return rv;
}
int sendcb(const uint8_t *data, size_t len)
{ {
int rv; int rv;
auto output = bufferevent_get_output(bev); auto output = bufferevent_get_output(bev);
// Check buffer length and return WOULDBLOCK if it is large enough.
if(evbuffer_get_length(output) > config.output_upper_thres) {
return NGHTTP2_ERR_WOULDBLOCK;
}
rv = evbuffer_add(output, data, len); for(;;) {
if(rv == -1) { if(evbuffer_get_length(output) > config.output_upper_thres) {
std::cerr << "evbuffer_add() failed" << std::endl; break;
return NGHTTP2_ERR_CALLBACK_FAILURE; }
} else {
return len;
}
}
int recvcb(uint8_t *buf, size_t len) const uint8_t *data;
{ auto datalen = nghttp2_session_mem_send(session, &data);
auto input = bufferevent_get_input(bev);
int nread = evbuffer_remove(input, buf, len); if(datalen < 0) {
if(nread == -1) { std::cerr << "nghttp2_session_mem_send() returned error: "
return NGHTTP2_ERR_CALLBACK_FAILURE; << nghttp2_strerror(datalen) << std::endl;
} else if(nread == 0) { return -1;
return NGHTTP2_ERR_WOULDBLOCK; }
} else { if(datalen == 0) {
return nread; break;
}
rv = evbuffer_add(output, data, datalen);
if(rv == -1) {
std::cerr << "evbuffer_add() failed" << std::endl;
return -1;
}
} }
if(nghttp2_session_want_read(session) == 0 &&
nghttp2_session_want_write(session) == 0 &&
evbuffer_get_length(output) == 0) {
return -1;
}
return 0;
} }
bool all_requests_processed() const bool all_requests_processed() const
@ -1108,9 +1091,13 @@ void check_stream_id(nghttp2_session *session, int32_t stream_id,
namespace { namespace {
void settings_timeout_cb(evutil_socket_t fd, short what, void *arg) void settings_timeout_cb(evutil_socket_t fd, short what, void *arg)
{ {
int rv;
auto client = get_session(arg); auto client = get_session(arg);
nghttp2_session_terminate_session(client->session, NGHTTP2_SETTINGS_TIMEOUT); nghttp2_session_terminate_session(client->session, NGHTTP2_SETTINGS_TIMEOUT);
client->on_write(); rv = client->on_write();
if(rv != 0) {
client->disconnect();
}
} }
} // namespace } // namespace
@ -1436,27 +1423,6 @@ void eventcb(bufferevent *bev, short events, void *ptr)
} }
} // namespace } // namespace
namespace {
ssize_t client_send_callback(nghttp2_session *session,
const uint8_t *data, size_t len, int flags,
void *user_data)
{
auto client = static_cast<HttpClient*>(user_data);
return client->sendcb(data, len);
}
} // namespace
namespace {
ssize_t client_recv_callback(nghttp2_session *session,
uint8_t *buf, size_t len, int flags,
void *user_data)
{
auto client = static_cast<HttpClient*>(user_data);
return client->recvcb(buf, len);
}
} // namespace
namespace { namespace {
int communicate(const std::string& scheme, const std::string& host, int communicate(const std::string& scheme, const std::string& host,
uint16_t port, uint16_t port,
@ -1577,8 +1543,6 @@ int run(char **uris, int n)
{ {
nghttp2_session_callbacks callbacks; nghttp2_session_callbacks callbacks;
memset(&callbacks, 0, sizeof(nghttp2_session_callbacks)); memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
callbacks.send_callback = client_send_callback;
callbacks.recv_callback = client_recv_callback;
callbacks.on_stream_close_callback = on_stream_close_callback; callbacks.on_stream_close_callback = on_stream_close_callback;
callbacks.on_frame_recv_callback = on_frame_recv_callback2; callbacks.on_frame_recv_callback = on_frame_recv_callback2;
callbacks.before_frame_send_callback = before_frame_send_callback; callbacks.before_frame_send_callback = before_frame_send_callback;