Skip to content

TS-4732: Changing the do_io_read API so it can be called with NULL and #857

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
bryancall merged 1 commit into from
Sep 12, 2016
Merged

TS-4732: Changing the do_io_read API so it can be called with NULL and #857

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
26 changes: 10 additions & 16 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
#define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET))

#define disable_read(_vc) (_vc)->read.enabled = 0
#define disable_write(_vc) (_vc)->write.enabled = 0
#define enable_read(_vc) (_vc)->read.enabled = 1
#define enable_write(_vc) (_vc)->write.enabled = 1

#ifndef UIO_MAXIOV
#define NET_MAX_IOV 16 // UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
#else
Expand Down Expand Up @@ -622,8 +617,7 @@ UnixNetVConnection::get_data(int id, void *data)
VIO *
UnixNetVConnection::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
ink_assert(c || 0 == nbytes);
if (closed) {
if (closed && !(c == NULL && nbytes == 0 && buf == NULL)) {
Error("do_io_read invoked on closed vc %p, cont %p, nbytes %" PRId64 ", buf %p", this, c, nbytes, buf);
return NULL;
}
Expand All @@ -639,15 +633,15 @@ UnixNetVConnection::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
read.vio.reenable();
} else {
read.vio.buffer.clear();
disable_read(this);
read.enabled = 0;
}
return &read.vio;
}

VIO *
UnixNetVConnection::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *reader, bool owner)
{
if (closed) {
if (closed && !(c == NULL && nbytes == 0 && reader == NULL)) {
Error("do_io_write invoked on closed vc %p, cont %p, nbytes %" PRId64 ", reader %p", this, c, nbytes, reader);
return NULL;
}
Expand All @@ -663,16 +657,16 @@ UnixNetVConnection::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader
if (nbytes && !write.enabled)
write.vio.reenable();
} else {
disable_write(this);
write.enabled = 0;
}
return &write.vio;
}

void
UnixNetVConnection::do_io_close(int alerrno /* = -1 */)
{
disable_read(this);
disable_write(this);
read.enabled = 0;
write.enabled = 0;
read.vio.buffer.clear();
read.vio.nbytes = 0;
read.vio.op = VIO::NONE;
Expand Down Expand Up @@ -703,22 +697,22 @@ UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
switch (howto) {
case IO_SHUTDOWN_READ:
socketManager.shutdown(((UnixNetVConnection *)this)->con.fd, 0);
disable_read(this);
read.enabled = 0;
read.vio.buffer.clear();
read.vio.nbytes = 0;
f.shutdown = NET_VC_SHUTDOWN_READ;
break;
case IO_SHUTDOWN_WRITE:
socketManager.shutdown(((UnixNetVConnection *)this)->con.fd, 1);
disable_write(this);
write.enabled = 0;
write.vio.buffer.clear();
write.vio.nbytes = 0;
f.shutdown = NET_VC_SHUTDOWN_WRITE;
break;
case IO_SHUTDOWN_READWRITE:
socketManager.shutdown(((UnixNetVConnection *)this)->con.fd, 2);
disable_read(this);
disable_write(this);
read.enabled = 0;
write.enabled = 0;
read.vio.buffer.clear();
read.vio.nbytes = 0;
write.vio.buffer.clear();
Expand Down
3 changes: 1 addition & 2 deletions proxy/http2/Http2ClientSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,7 @@ class Http2ClientSession : public ProxyClientSession
virtual void
release_netvc()
{
// Make sure the vio's are also released to avoid
// later surprises in inactivity timeout
// Make sure the vio's are also released to avoid later surprises in inactivity timeout
if (client_vc) {
client_vc->do_io_read(NULL, 0, NULL);
client_vc->do_io_write(NULL, 0, NULL);
Expand Down