Backed out changeset f7d82a8a8e94 (bug 1118618) for Bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 13 Jan 2015 08:44:29 +0100
changeset 223504 c1549e8bf04e8698ba36c007e10feb14edbfa03e
parent 223503 23cc21e9bfef08b5330aae6a936187177bfef6b8
child 223505 f9662e8dd46c50300deaf5ded4a841f645ef9230
push id28095
push usercbook@mozilla.com
push dateTue, 13 Jan 2015 13:24:48 +0000
treeherdermozilla-central@a5700bec72e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1118618
milestone38.0a1
backs outf7d82a8a8e94a74ff4afd522602a39120658e44e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f7d82a8a8e94 (bug 1118618) for Bustage on a CLOSED TREE
ipc/glue/MessageChannel.cpp
ipc/glue/MessageChannel.h
ipc/glue/MessageLink.h
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -172,21 +172,16 @@ public:
         return INTR_SEMS == mMesageSemantics && IN_MESSAGE == mDirection;
     }
 
     bool IsInterruptOutcall() const
     {
         return INTR_SEMS == mMesageSemantics && OUT_MESSAGE == mDirection;
     }
 
-    bool IsOutgoingSync() const {
-        return (mMesageSemantics == INTR_SEMS || mMesageSemantics == SYNC_SEMS) &&
-               mDirection == OUT_MESSAGE;
-    }
-
     void Describe(int32_t* id, const char** dir, const char** sems,
                   const char** name) const
     {
         *id = mMessageRoutingId;
         *dir = (IN_MESSAGE == mDirection) ? "in" : "out";
         *sems = (INTR_SEMS == mMesageSemantics) ? "intr" :
                 (SYNC_SEMS == mMesageSemantics) ? "sync" :
                 "async";
@@ -218,45 +213,37 @@ public:
 
         mThat.mCxxStackFrames.append(InterruptFrame(direction, msg));
 
         const InterruptFrame& frame = mThat.mCxxStackFrames.back();
 
         if (frame.IsInterruptIncall())
             mThat.EnteredCall();
 
-        if (frame.IsOutgoingSync())
-            mThat.EnteredSyncSend();
-
         mThat.mSawInterruptOutMsg |= frame.IsInterruptOutcall();
     }
 
     ~CxxStackFrame() {
         mThat.AssertWorkerThread();
 
         MOZ_ASSERT(!mThat.mCxxStackFrames.empty());
 
-        const InterruptFrame& frame = mThat.mCxxStackFrames.back();
-        bool exitingSync = frame.IsOutgoingSync();
-        bool exitingCall = frame.IsInterruptIncall();
+        bool exitingCall = mThat.mCxxStackFrames.back().IsInterruptIncall();
         mThat.mCxxStackFrames.shrinkBy(1);
 
         bool exitingStack = mThat.mCxxStackFrames.empty();
 
         // mListener could have gone away if Close() was called while
         // MessageChannel code was still on the stack
         if (!mThat.mListener)
             return;
 
         if (exitingCall)
             mThat.ExitedCall();
 
-        if (exitingSync)
-            mThat.ExitedSyncSend();
-
         if (exitingStack)
             mThat.ExitedCxxStack();
     }
 private:
     MessageChannel& mThat;
 
     // Disable harmful methods.
     CxxStackFrame() = delete;
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -286,24 +286,16 @@ class MessageChannel : HasResultCodes
     void EnteredCall() {
         mListener->OnEnteredCall();
     }
 
     void ExitedCall() {
         mListener->OnExitedCall();
     }
 
-    void EnteredSyncSend() {
-        mListener->OnEnteredSyncSend();
-    }
-
-    void ExitedSyncSend() {
-        mListener->OnExitedSyncSend();
-    }
-
     MessageListener *Listener() const {
         return mListener.get();
     }
 
     void DebugAbort(const char* file, int line, const char* cond,
                     const char* why,
                     bool reply=false) const;
 
--- a/ipc/glue/MessageLink.h
+++ b/ipc/glue/MessageLink.h
@@ -93,21 +93,16 @@ class MessageListener
     virtual void OnBeginSyncTransaction() {
     }
     virtual RacyInterruptPolicy MediateInterruptRace(const Message& parent,
                                                      const Message& child)
     {
         return RIPChildWins;
     }
 
-    virtual void OnEnteredSyncSend() {
-    }
-    virtual void OnExitedSyncSend() {
-    }
-
     virtual void ProcessRemoteNativeEventsInInterruptCall() {
     }
 
     // FIXME/bug 792652: this doesn't really belong here, but a
     // large refactoring is needed to put it where it belongs.
     virtual int32_t GetProtocolTypeId() = 0;
 };