Skip to content

NetEvent cleanup - replace #define with constexpr #7804

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
SolidWallOfCode merged 1 commit into from
May 12, 2021
Merged

NetEvent cleanup - replace #define with constexpr #7804

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
6 changes: 4 additions & 2 deletions iocore/net/NetEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,12 @@ class NetEvent
LINK(NetEvent, keep_alive_queue_link);
LINK(NetEvent, active_queue_link);

/// Values for @a f.shutdown
static constexpr unsigned SHUTDOWN_READ = 1;
static constexpr unsigned SHUTDOWN_WRITE = 2;

union {
unsigned int flags = 0;
#define NET_VC_SHUTDOWN_READ 1
#define NET_VC_SHUTDOWN_WRITE 2
struct {
unsigned int got_local_addr : 1;
unsigned int shutdown : 2;
Expand Down
10 changes: 5 additions & 5 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,15 +698,15 @@ UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
read.vio.buffer.clear();
read.vio.nbytes = 0;
read.vio.cont = nullptr;
f.shutdown |= NET_VC_SHUTDOWN_READ;
f.shutdown |= NetEvent::SHUTDOWN_READ;
break;
case IO_SHUTDOWN_WRITE:
socketManager.shutdown((this)->con.fd, 1);
write.enabled = 0;
write.vio.buffer.clear();
write.vio.nbytes = 0;
write.vio.cont = nullptr;
f.shutdown |= NET_VC_SHUTDOWN_WRITE;
f.shutdown |= NetEvent::SHUTDOWN_WRITE;
break;
case IO_SHUTDOWN_READWRITE:
socketManager.shutdown((this)->con.fd, 2);
Expand All @@ -718,7 +718,7 @@ UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
write.vio.nbytes = 0;
read.vio.cont = nullptr;
write.vio.cont = nullptr;
f.shutdown = NET_VC_SHUTDOWN_READ | NET_VC_SHUTDOWN_WRITE;
f.shutdown = NetEvent::SHUTDOWN_READ | NetEvent::SHUTDOWN_WRITE;
break;
default:
ink_assert(!"not reached");
Expand Down Expand Up @@ -1154,14 +1154,14 @@ UnixNetVConnection::mainEvent(int event, Event *e)
return EVENT_DONE;
}

if (read.vio.op == VIO::READ && !(f.shutdown & NET_VC_SHUTDOWN_READ)) {
if (read.vio.op == VIO::READ && !(f.shutdown & NetEvent::SHUTDOWN_READ)) {
reader_cont = read.vio.cont;
if (read_signal_and_update(signal_event, this) == EVENT_DONE) {
return EVENT_DONE;
}
}

if (!*signal_timeout_at && !closed && write.vio.op == VIO::WRITE && !(f.shutdown & NET_VC_SHUTDOWN_WRITE) &&
if (!*signal_timeout_at && !closed && write.vio.op == VIO::WRITE && !(f.shutdown & NetEvent::SHUTDOWN_WRITE) &&
reader_cont != write.vio.cont && writer_cont == write.vio.cont) {
if (write_signal_and_update(signal_event, this) == EVENT_DONE) {
return EVENT_DONE;
Expand Down