Skip to content

Move handleEvent back into the header file. #4156

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
Aug 24, 2018
Merged

Move handleEvent back into the header file. #4156

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
9 changes: 0 additions & 9 deletions iocore/eventsystem/Continuation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@

#include "I_EventSystem.h"
#include "I_Continuation.h"
#include "I_EThread.h"

int
Continuation::handleEvent(int event, void *data)
{
// If there is a lock, we must be holding it on entry
ink_release_assert(!mutex || mutex->thread_holding == this_ethread());
return (this->*handler)(event, data);
}

int
Continuation::dispatchEvent(int event, void *data)
Expand Down
11 changes: 10 additions & 1 deletion iocore/eventsystem/I_Continuation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ class ContinuationQueue;
class Processor;
class ProxyMutex;
class EThread;
class Event;

extern EThread *this_ethread();

//////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -154,7 +157,13 @@ class Continuation : private force_VFPT_to_top
@return State machine and processor specific return code.

*/
int handleEvent(int event = CONTINUATION_EVENT_NONE, void *data = nullptr);
TS_INLINE int
handleEvent(int event = CONTINUATION_EVENT_NONE, void *data = nullptr)
{
// If there is a lock, we must be holding it on entry
ink_release_assert(!mutex || mutex->thread_holding == this_ethread());
return (this->*handler)(event, data);
}

/**
Receives the event code and data for an Event.
Expand Down