Skip to content

Replace ACTION_RESULT_NONE with nullptr #7135

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
shinrich merged 1 commit into from
Sep 1, 2020
Merged

Replace ACTION_RESULT_NONE with nullptr #7135

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: 0 additions & 2 deletions iocore/eventsystem/I_Action.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,8 @@ class Action
virtual ~Action() {}
};

#define ACTION_RESULT_NONE MAKE_ACTION_RESULT(0)
#define ACTION_RESULT_DONE MAKE_ACTION_RESULT(1)
#define ACTION_IO_ERROR MAKE_ACTION_RESULT(2)
#define ACTION_RESULT_INLINE MAKE_ACTION_RESULT(3)

// Use these classes by
// #define ACTION_RESULT_HOST_DB_OFFLINE
Expand Down
2 changes: 1 addition & 1 deletion iocore/net/I_UDPConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class UDPConnection : public Continuation
<br>
cont->handleEvent(NET_EVENT_DATAGRAM_READ_READY, Queue&lt;UDPPacketInternal&gt; *) on incoming packets.

@return Action* Always returns ACTION_RESULT_NONE. Can't be
@return Action* Always returns nullptr. Can't be
cancelled via this Action.
@param c continuation to be called back
*/
Expand Down
2 changes: 1 addition & 1 deletion iocore/net/P_UnixUDPConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ UDPConnection::recv(Continuation *c)
p->continuation = c;
ink_assert(c != nullptr);
mutex = c->mutex;
return ACTION_RESULT_NONE;
return nullptr;
}

TS_INLINE UDPConnection *
Expand Down
2 changes: 1 addition & 1 deletion iocore/net/UnixNetProcessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Action *
UnixNetProcessor::connect_re_internal(Continuation *cont, sockaddr const *target, NetVCOptions *opt)
{
if (TSSystemState::is_event_system_shut_down()) {
return ACTION_RESULT_NONE;
return nullptr;
}
EThread *t = eventProcessor.assign_affinity_by_type(cont, opt->etype);
UnixNetVConnection *vc = (UnixNetVConnection *)this->allocate_vc(t);
Expand Down
4 changes: 2 additions & 2 deletions iocore/net/UnixUDPConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ UDPConnection::send(Continuation *c, UDPPacket *xp)
if (shouldDestroy()) {
ink_assert(!"freeing packet sent on dead connection");
p->free();
return ACTION_RESULT_NONE;
return nullptr;
}

ink_assert(mutex == c->mutex);
Expand All @@ -132,7 +132,7 @@ UDPConnection::send(Continuation *c, UDPPacket *xp)
mutex = c->mutex;
p->reqGenerationNum = conn->sendGenerationNum;
get_UDPNetHandler(conn->ethread)->udpOutQueue.send(p);
return ACTION_RESULT_NONE;
return nullptr;
}

void
Expand Down