Thanks to visit codestin.com
Credit goes to github.com

Skip to content

use predifined function 'h2o_socket_is_reading|writing' #1973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2019
Merged

use predifined function 'h2o_socket_is_reading|writing' #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/h2o/httpclient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ typedef struct st_h2o_httpclient_ctx_t {
uint64_t connect_timeout;
uint64_t first_byte_timeout;
uint64_t *websocket_timeout; /* NULL if upgrade to websocket is not allowed */
uint64_t keepalive_timeout;
uint64_t keepalive_timeout; /* only used for http2 for now */
size_t max_buffer_size;

struct {
Expand Down
6 changes: 3 additions & 3 deletions lib/common/http1client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ static int do_write_req(h2o_httpclient_t *_client, h2o_iovec_t chunk, int is_end
return -1;
}

if (client->sock->_cb.write != NULL)
if (h2o_socket_is_writing(client->sock))
return 0;

assert(client->_body_buf_in_flight == NULL || client->_body_buf_in_flight->size == 0);
Expand Down Expand Up @@ -626,12 +626,12 @@ static void do_update_window(h2o_httpclient_t *_client)
{
struct st_h2o_http1client_t *client = (void *)_client;
if ((*client->super.buf)->size >= client->super.ctx->max_buffer_size) {
if (client->sock->_cb.read != NULL) {
if (h2o_socket_is_reading(client->sock)) {
client->reader = client->sock->_cb.read;
h2o_socket_read_stop(client->sock);
}
} else {
if (client->sock->_cb.read == NULL) {
if (!h2o_socket_is_reading(client->sock)) {
h2o_socket_read_start(client->sock, client->reader);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/common/http2client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static void request_write(struct st_h2o_http2client_conn_t *conn)
{
if (conn->state == H2O_HTTP2CLIENT_CONN_STATE_IS_CLOSING)
return;
if (conn->super.sock->_cb.write == NULL && !h2o_timer_is_linked(&conn->output.defer_timeout))
if (!h2o_socket_is_writing(conn->super.sock) && !h2o_timer_is_linked(&conn->output.defer_timeout))
h2o_timer_link(conn->super.ctx->loop, 0, &conn->output.defer_timeout);
}

Expand Down