[trafficserver] branch master updated: Move handleEvent back into the header file.

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new f590e4e  Move handleEvent back into the header file.
f590e4e is described below

commit f590e4ec977fb1db70580c3979a900c5802d1c8e
Author: Susan Hinrichs <sh...@oath.com>
AuthorDate: Thu Aug 23 14:07:20 2018 +0000

    Move handleEvent back into the header file.
---
 iocore/eventsystem/Continuation.cc  |  9 ---------
 iocore/eventsystem/I_Continuation.h | 11 ++++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/iocore/eventsystem/Continuation.cc b/iocore/eventsystem/Continuation.cc
index 26de73b..c693632 100644
--- a/iocore/eventsystem/Continuation.cc
+++ b/iocore/eventsystem/Continuation.cc
@@ -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)
diff --git a/iocore/eventsystem/I_Continuation.h b/iocore/eventsystem/I_Continuation.h
index 8d662d6..53c3919 100644
--- a/iocore/eventsystem/I_Continuation.h
+++ b/iocore/eventsystem/I_Continuation.h
@@ -45,6 +45,9 @@ class ContinuationQueue;
 class Processor;
 class ProxyMutex;
 class EThread;
+class Event;
+
+extern EThread *this_ethread();
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -154,7 +157,13 @@ public:
     @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.