Skip to content

Cleanup: Get rid of NetVConnection::outstanding() #7366

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
masaori335 merged 1 commit into from
Dec 3, 2020
Merged

Cleanup: Get rid of NetVConnection::outstanding() #7366

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
8 changes: 0 additions & 8 deletions iocore/net/I_NetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,6 @@ struct NetVCOptions {
class NetVConnection : public VConnection, public PluginUserArgs<TS_USER_ARGS_VCONN>
{
public:
// How many bytes have been queued to the OS for sending by haven't been sent yet
// Not all platforms support this, and if they don't we'll return -1 for them
virtual int64_t
outstanding()
{
return -1;
};

/**
Initiates read. Thread safe, may be called when not handling
an event from the NetVConnection, or the NetVConnection creation
Expand Down
1 change: 0 additions & 1 deletion iocore/net/P_UnixNetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ enum tcp_congestion_control_t { CLIENT_SIDE, SERVER_SIDE };
class UnixNetVConnection : public NetVConnection, public NetEvent
{
public:
int64_t outstanding() override;
VIO *do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf) override;
VIO *do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *buf, bool owner = false) override;

Expand Down
13 changes: 0 additions & 13 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,19 +571,6 @@ UnixNetVConnection::get_data(int id, void *data)
}
}

int64_t
UnixNetVConnection::outstanding()
{
int n;
int ret = ioctl(this->get_socket(), TIOCOUTQ, &n);
// if there was an error (such as ioctl doesn't support this call on this platform) then
// we return -1
if (ret == -1) {
return ret;
}
return n;
}

VIO *
UnixNetVConnection::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
Expand Down