From 5d401656504dbd156866a887bca7bf9af4ca5750 Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Tue, 12 May 2015 12:35:33 -0700 Subject: [PATCH] shorten callback accessor boilerplate Summary: I submit that "On" in these property names is enough clarity that they're callbacks, to drop the word "Callback" Reviewed By: @jano Differential Revision: D2060751 --- hphp/runtime/ext/asio/asio-context.cpp | 4 +- hphp/runtime/ext/asio/asio-session.cpp | 153 ++++++++------------- hphp/runtime/ext/asio/asio-session.h | 108 +++++++-------- .../ext/asio/async-function-wait-handle.cpp | 2 +- .../ext/asio/async-generator-wait-handle.cpp | 2 +- hphp/runtime/ext/asio/await-all-wait-handle.cpp | 4 +- hphp/runtime/ext/asio/condition-wait-handle.cpp | 4 +- .../ext/asio/external-thread-event-wait-handle.cpp | 12 +- hphp/runtime/ext/asio/gen-array-wait-handle.cpp | 4 +- hphp/runtime/ext/asio/gen-map-wait-handle.cpp | 4 +- hphp/runtime/ext/asio/gen-vector-wait-handle.cpp | 4 +- hphp/runtime/ext/asio/resumable-wait-handle.cpp | 8 +- hphp/runtime/ext/asio/sleep-wait-handle.cpp | 8 +- hphp/runtime/ext/asio/wait-handle.cpp | 6 +- hphp/runtime/ext/asio/waitable-wait-handle.cpp | 2 +- hphp/runtime/vm/event-hook.cpp | 6 +- 16 files changed, 141 insertions(+), 190 deletions(-) diff --git a/hphp/runtime/ext/asio/asio-context.cpp b/hphp/runtime/ext/asio/asio-context.cpp index 07bb5068226..4328149a26f 100644 --- a/hphp/runtime/ext/asio/asio-context.cpp +++ b/hphp/runtime/ext/asio/asio-context.cpp @@ -59,7 +59,7 @@ namespace { } inline void onIOWaitEnter(AsioSession* session) { - if (UNLIKELY(session->hasOnIOWaitEnterCallback())) { + if (UNLIKELY(session->hasOnIOWaitEnter())) { session->onIOWaitEnter(); } } @@ -79,7 +79,7 @@ namespace { } } - if (UNLIKELY(session->hasOnIOWaitExitCallback())) { + if (UNLIKELY(session->hasOnIOWaitExit())) { session->onIOWaitExit(); } } diff --git a/hphp/runtime/ext/asio/asio-session.cpp b/hphp/runtime/ext/asio/asio-session.cpp index 7823428b73e..6f69cfa51d0 100644 --- a/hphp/runtime/ext/asio/asio-session.cpp +++ b/hphp/runtime/ext/asio/asio-session.cpp @@ -109,85 +109,55 @@ void AsioSession::initAbruptInterruptException() { "The request was abruptly interrupted."); } -void AsioSession::setOnIOWaitEnterCallback(const Variant& callback) { - m_onIOWaitEnterCallback = checkCallback( - callback, - "WaitHandle::onIOWaitEnter" - ); +void AsioSession::setOnIOWaitEnter(const Variant& callback) { + m_onIOWaitEnter = checkCallback(callback, "WaitHandle::onIOWaitEnter"); } -void AsioSession::setOnIOWaitExitCallback(const Variant& callback) { - m_onIOWaitExitCallback = checkCallback( - callback, - "WaitHandle::onIOWaitExit" - ); +void AsioSession::setOnIOWaitExit(const Variant& callback) { + m_onIOWaitExit = checkCallback(callback, "WaitHandle::onIOWaitExit"); } -void AsioSession::setOnJoinCallback(const Variant& callback) { - m_onJoinCallback = checkCallback(callback, "WaitHandle::onJoin"); +void AsioSession::setOnJoin(const Variant& callback) { + m_onJoin = checkCallback(callback, "WaitHandle::onJoin"); } void AsioSession::onIOWaitEnter() { - runCallback( - m_onIOWaitEnterCallback, - empty_array(), - "WaitHandle::onIOWaitEnter" - ); + runCallback(m_onIOWaitEnter, empty_array(), "WaitHandle::onIOWaitEnter"); } void AsioSession::onIOWaitExit() { - runCallback( - m_onIOWaitExitCallback, - empty_array(), - "WaitHandle::onIOWaitExit" - ); + runCallback(m_onIOWaitExit, empty_array(), "WaitHandle::onIOWaitExit"); } void AsioSession::onJoin(c_WaitHandle* waitHandle) { - runCallback( - m_onJoinCallback, - make_packed_array(waitHandle), - "WaitHandle::onJoin" - ); + runCallback(m_onJoin, make_packed_array(waitHandle), "WaitHandle::onJoin"); } -void AsioSession::setOnResumableCreateCallback(const Variant& callback) { - m_onResumableCreateCallback = checkCallback( - callback, - "ResumableWaitHandle::onCreate" - ); +void AsioSession::setOnResumableCreate(const Variant& callback) { + m_onResumableCreate = checkCallback(callback,"ResumableWaitHandle::onCreate"); updateEventHookState(); } -void AsioSession::setOnResumableAwaitCallback(const Variant& callback) { - m_onResumableAwaitCallback = checkCallback( - callback, - "ResumableWaitHandle::onAwait" - ); +void AsioSession::setOnResumableAwait(const Variant& callback) { + m_onResumableAwait = checkCallback(callback, "ResumableWaitHandle::onAwait"); updateEventHookState(); } -void AsioSession::setOnResumableSuccessCallback(const Variant& callback) { - m_onResumableSuccessCallback = checkCallback( - callback, - "ResumableWaitHandle::onSuccess" - ); +void AsioSession::setOnResumableSuccess(const Variant& callback) { + m_onResumableSuccess = checkCallback(callback, + "ResumableWaitHandle::onSuccess"); updateEventHookState(); } -void AsioSession::setOnResumableFailCallback(const Variant& callback) { - m_onResumableFailCallback = checkCallback( - callback, - "ResumableWaitHandle::onFail" - ); +void AsioSession::setOnResumableFail(const Variant& callback) { + m_onResumableFail = checkCallback(callback, "ResumableWaitHandle::onFail"); } void AsioSession::onResumableCreate( c_ResumableWaitHandle* resumable, c_WaitableWaitHandle* child ) { - runCallback( - m_onResumableCreateCallback, + runCallback(m_onResumableCreate, make_packed_array(resumable, child), "ResumableWaitHandle::onCreate" ); @@ -198,7 +168,7 @@ void AsioSession::onResumableAwait( c_WaitableWaitHandle* child ) { runCallback( - m_onResumableAwaitCallback, + m_onResumableAwait, make_packed_array(resumable, child), "ResumableWaitHandle::onAwait" ); @@ -209,7 +179,7 @@ void AsioSession::onResumableSuccess( const Variant& result ) { runCallback( - m_onResumableSuccessCallback, + m_onResumableSuccess, make_packed_array(resumable, result), "ResumableWaitHandle::onSuccess" ); @@ -220,24 +190,24 @@ void AsioSession::onResumableFail( const Object& exception ) { runCallback( - m_onResumableFailCallback, + m_onResumableFail, make_packed_array(resumable, exception), "ResumableWaitHandle::onFail" ); } void AsioSession::updateEventHookState() { - if (hasOnResumableCreateCallback() || - hasOnResumableAwaitCallback() || - hasOnResumableSuccessCallback()) { + if (hasOnResumableCreate() || + hasOnResumableAwait() || + hasOnResumableSuccess()) { EventHook::EnableAsync(); } else { EventHook::DisableAsync(); } } -void AsioSession::setOnAwaitAllCreateCallback(const Variant& callback) { - m_onAwaitAllCreateCallback = checkCallback( +void AsioSession::setOnAwaitAllCreate(const Variant& callback) { + m_onAwaitAllCreate = checkCallback( callback, "AwaitAllWaitHandle::onCreate" ); @@ -248,17 +218,14 @@ void AsioSession::onAwaitAllCreate( const Variant &dependencies ) { runCallback( - m_onAwaitAllCreateCallback, + m_onAwaitAllCreate, make_packed_array(waitHandle, dependencies), "AwaitAllWaitHandle::onCreate" ); } -void AsioSession::setOnGenArrayCreateCallback(const Variant& callback) { - m_onGenArrayCreateCallback = checkCallback( - callback, - "GenArrayWaitHandle::onCreate" - ); +void AsioSession::setOnGenArrayCreate(const Variant& callback) { + m_onGenArrayCreate = checkCallback(callback, "GenArrayWaitHandle::onCreate"); } void AsioSession::onGenArrayCreate( @@ -266,35 +233,28 @@ void AsioSession::onGenArrayCreate( const Variant& dependencies ) { runCallback( - m_onGenArrayCreateCallback, + m_onGenArrayCreate, make_packed_array(waitHandle, dependencies), "GenArrayWaitHandle::onCreate" ); } -void AsioSession::setOnGenMapCreateCallback(const Variant& callback) { - m_onGenMapCreateCallback = checkCallback( - callback, - "GenMapWaitHandle::onCreate" - ); +void AsioSession::setOnGenMapCreate(const Variant& callback) { + m_onGenMapCreate = checkCallback(callback, "GenMapWaitHandle::onCreate"); } void AsioSession::onGenMapCreate( c_GenMapWaitHandle* waitHandle, const Variant& dependencies ) { - runCallback( - m_onGenMapCreateCallback, + runCallback(m_onGenMapCreate, make_packed_array(waitHandle, dependencies), "GenMapWaitHandle::onCreate" ); } -void AsioSession::setOnGenVectorCreateCallback(const Variant& callback) { - m_onGenVectorCreateCallback = checkCallback( - callback, - "GenVectorWaitHandle::onCreate" - ); +void AsioSession::setOnGenVectorCreate(const Variant& callback) { + m_onGenVectorCreate= checkCallback(callback, "GenVectorWaitHandle::onCreate"); } void AsioSession::onGenVectorCreate( @@ -302,17 +262,14 @@ void AsioSession::onGenVectorCreate( const Variant& dependencies ) { runCallback( - m_onGenVectorCreateCallback, + m_onGenVectorCreate, make_packed_array(waitHandle, dependencies), "GenVectorWaitHandle::onCreate" ); } -void AsioSession::setOnConditionCreateCallback(const Variant& callback) { - m_onConditionCreateCallback = checkCallback( - callback, - "ConditionWaitHandle::onCreate" - ); +void AsioSession::setOnConditionCreate(const Variant& callback) { + m_onConditionCreate = checkCallback(callback,"ConditionWaitHandle::onCreate"); } void AsioSession::onConditionCreate( @@ -320,34 +277,34 @@ void AsioSession::onConditionCreate( c_WaitableWaitHandle* child ) { runCallback( - m_onConditionCreateCallback, + m_onConditionCreate, make_packed_array(waitHandle, child), "ConditionWaitHandle::onCreate" ); } -void AsioSession::setOnExternalThreadEventCreateCallback( +void AsioSession::setOnExternalThreadEventCreate( const Variant& callback ) { - m_onExternalThreadEventCreateCallback = checkCallback( + m_onExtThreadEventCreate = checkCallback( callback, "ExternalThreadEventWaitHandle::onCreate" ); } -void AsioSession::setOnExternalThreadEventSuccessCallback( +void AsioSession::setOnExternalThreadEventSuccess( const Variant& callback ) { - m_onExternalThreadEventSuccessCallback = checkCallback( + m_onExtThreadEventSuccess = checkCallback( callback, "ExternalThreadEventWaitHandle::onSuccess" ); } -void AsioSession::setOnExternalThreadEventFailCallback( +void AsioSession::setOnExternalThreadEventFail( const Variant& callback ) { - m_onExternalThreadEventFailCallback = checkCallback( + m_onExtThreadEventFail = checkCallback( callback, "ExternalThreadEventWaitHandle::onFail" ); @@ -357,7 +314,7 @@ void AsioSession::onExternalThreadEventCreate( c_ExternalThreadEventWaitHandle* waitHandle ) { runCallback( - m_onExternalThreadEventCreateCallback, + m_onExtThreadEventCreate, make_packed_array(waitHandle), "ExternalThreadEventWaitHandle::onCreate" ); @@ -368,7 +325,7 @@ void AsioSession::onExternalThreadEventSuccess( const Variant& result ) { runCallback( - m_onExternalThreadEventSuccessCallback, + m_onExtThreadEventSuccess, make_packed_array(waitHandle, result), "ExternalThreadEventWaitHandle::onSuccess" ); @@ -379,21 +336,21 @@ void AsioSession::onExternalThreadEventFail( const Object& exception ) { runCallback( - m_onExternalThreadEventFailCallback, + m_onExtThreadEventFail, make_packed_array(waitHandle, exception), "ExternalThreadEventWaitHandle::onFail" ); } -void AsioSession::setOnSleepCreateCallback(const Variant& callback) { - m_onSleepCreateCallback = checkCallback( +void AsioSession::setOnSleepCreate(const Variant& callback) { + m_onSleepCreate = checkCallback( callback, "SleepWaitHandle::onCreate" ); } -void AsioSession::setOnSleepSuccessCallback(const Variant& callback) { - m_onSleepSuccessCallback = checkCallback( +void AsioSession::setOnSleepSuccess(const Variant& callback) { + m_onSleepSuccess = checkCallback( callback, "SleepWaitHandle::onSuccess" ); @@ -401,7 +358,7 @@ void AsioSession::setOnSleepSuccessCallback(const Variant& callback) { void AsioSession::onSleepCreate(c_SleepWaitHandle* waitHandle) { runCallback( - m_onSleepCreateCallback, + m_onSleepCreate, make_packed_array(waitHandle), "SleepWaitHandle::onCreate" ); @@ -409,7 +366,7 @@ void AsioSession::onSleepCreate(c_SleepWaitHandle* waitHandle) { void AsioSession::onSleepSuccess(c_SleepWaitHandle* waitHandle) { runCallback( - m_onSleepSuccessCallback, + m_onSleepSuccess, make_packed_array(waitHandle), "SleepWaitHandle::onSuccess" ); diff --git a/hphp/runtime/ext/asio/asio-session.h b/hphp/runtime/ext/asio/asio-session.h index 38b9537603f..eda360fecfc 100644 --- a/hphp/runtime/ext/asio/asio-session.h +++ b/hphp/runtime/ext/asio/asio-session.h @@ -101,25 +101,25 @@ struct AsioSession final { void initAbruptInterruptException(); // WaitHandle callbacks: - void setOnIOWaitEnterCallback(const Variant& callback); - void setOnIOWaitExitCallback(const Variant& callback); - void setOnJoinCallback(const Variant& callback); - bool hasOnIOWaitEnterCallback() { return !m_onIOWaitEnterCallback.isNull(); } - bool hasOnIOWaitExitCallback() { return !m_onIOWaitExitCallback.isNull(); } - bool hasOnJoinCallback() { return !m_onJoinCallback.isNull(); } + void setOnIOWaitEnter(const Variant& callback); + void setOnIOWaitExit(const Variant& callback); + void setOnJoin(const Variant& callback); + bool hasOnIOWaitEnter() { return !!m_onIOWaitEnter; } + bool hasOnIOWaitExit() { return !!m_onIOWaitExit; } + bool hasOnJoin() { return !!m_onJoin; } void onIOWaitEnter(); void onIOWaitExit(); void onJoin(c_WaitHandle* waitHandle); // ResumableWaitHandle callbacks: - void setOnResumableCreateCallback(const Variant& callback); - void setOnResumableAwaitCallback(const Variant& callback); - void setOnResumableSuccessCallback(const Variant& callback); - void setOnResumableFailCallback(const Variant& callback); - bool hasOnResumableCreateCallback() { return !!m_onResumableCreateCallback; } - bool hasOnResumableAwaitCallback() { return !!m_onResumableAwaitCallback; } - bool hasOnResumableSuccessCallback() { return !!m_onResumableSuccessCallback;} - bool hasOnResumableFailCallback() { return !!m_onResumableFailCallback; } + void setOnResumableCreate(const Variant& callback); + void setOnResumableAwait(const Variant& callback); + void setOnResumableSuccess(const Variant& callback); + void setOnResumableFail(const Variant& callback); + bool hasOnResumableCreate() { return !!m_onResumableCreate; } + bool hasOnResumableAwait() { return !!m_onResumableAwait; } + bool hasOnResumableSuccess() { return !!m_onResumableSuccess; } + bool hasOnResumableFail() { return !!m_onResumableFail; } void onResumableCreate(c_ResumableWaitHandle*, c_WaitableWaitHandle* child); void onResumableAwait(c_ResumableWaitHandle*, c_WaitableWaitHandle* child); void onResumableSuccess(c_ResumableWaitHandle* cont, const Variant& result); @@ -127,43 +127,37 @@ struct AsioSession final { void updateEventHookState(); // AwaitAllWaitHandle callbacks: - void setOnAwaitAllCreateCallback(const Variant& callback); - bool hasOnAwaitAllCreateCallback() { return !!m_onAwaitAllCreateCallback; } + void setOnAwaitAllCreate(const Variant& callback); + bool hasOnAwaitAllCreate() { return !!m_onAwaitAllCreate; } void onAwaitAllCreate(c_AwaitAllWaitHandle* wh, const Variant& dependencies); // GenArrayWaitHandle callbacks: - void setOnGenArrayCreateCallback(const Variant& callback); - bool hasOnGenArrayCreateCallback() { return !!m_onGenArrayCreateCallback; } + void setOnGenArrayCreate(const Variant& callback); + bool hasOnGenArrayCreate() { return !!m_onGenArrayCreate; } void onGenArrayCreate(c_GenArrayWaitHandle* wh, const Variant& dependencies); // GenMapWaitHandle callbacks: - void setOnGenMapCreateCallback(const Variant& callback); - bool hasOnGenMapCreateCallback() { return !!m_onGenMapCreateCallback; } + void setOnGenMapCreate(const Variant& callback); + bool hasOnGenMapCreate() { return !!m_onGenMapCreate; } void onGenMapCreate(c_GenMapWaitHandle* wh, const Variant& dependencies); // GenVectorWaitHandle callbacks: - void setOnGenVectorCreateCallback(const Variant& callback); - bool hasOnGenVectorCreateCallback() { return !!m_onGenVectorCreateCallback; } + void setOnGenVectorCreate(const Variant& callback); + bool hasOnGenVectorCreate() { return !!m_onGenVectorCreate; } void onGenVectorCreate(c_GenVectorWaitHandle* wh, const Variant& deps); // ConditionWaitHandle callbacks: - void setOnConditionCreateCallback(const Variant& callback); - bool hasOnConditionCreateCallback() { return !!m_onConditionCreateCallback; } + void setOnConditionCreate(const Variant& callback); + bool hasOnConditionCreate() { return !!m_onConditionCreate; } void onConditionCreate(c_ConditionWaitHandle* wh, c_WaitableWaitHandle*); // ExternalThreadEventWaitHandle callbacks: - void setOnExternalThreadEventCreateCallback(const Variant& callback); - void setOnExternalThreadEventSuccessCallback(const Variant& callback); - void setOnExternalThreadEventFailCallback(const Variant& callback); - bool hasOnExternalThreadEventCreateCallback() { - return !m_onExternalThreadEventCreateCallback.isNull(); - } - bool hasOnExternalThreadEventSuccessCallback() { - return !m_onExternalThreadEventSuccessCallback.isNull(); - } - bool hasOnExternalThreadEventFailCallback() { - return !m_onExternalThreadEventFailCallback.isNull(); - } + void setOnExternalThreadEventCreate(const Variant& callback); + void setOnExternalThreadEventSuccess(const Variant& callback); + void setOnExternalThreadEventFail(const Variant& callback); + bool hasOnExternalThreadEventCreate() { return !!m_onExtThreadEventCreate; } + bool hasOnExternalThreadEventSuccess() { return !!m_onExtThreadEventSuccess; } + bool hasOnExternalThreadEventFail() { return !!m_onExtThreadEventFail; } void onExternalThreadEventCreate(c_ExternalThreadEventWaitHandle* waitHandle); void onExternalThreadEventSuccess(c_ExternalThreadEventWaitHandle* waitHandle, const Variant& result); @@ -171,10 +165,10 @@ struct AsioSession final { const Object& exception); // SleepWaitHandle callbacks: - void setOnSleepCreateCallback(const Variant& callback); - void setOnSleepSuccessCallback(const Variant& callback); - bool hasOnSleepCreateCallback() { return !!m_onSleepCreateCallback; } - bool hasOnSleepSuccessCallback() { return !!m_onSleepSuccessCallback; } + void setOnSleepCreate(const Variant& callback); + void setOnSleepSuccess(const Variant& callback); + bool hasOnSleepCreate() { return !!m_onSleepCreate; } + bool hasOnSleepSuccess() { return !!m_onSleepSuccess; } void onSleepCreate(c_SleepWaitHandle* waitHandle); void onSleepSuccess(c_SleepWaitHandle* waitHandle); @@ -188,23 +182,23 @@ private: AsioExternalThreadEventQueue m_externalThreadEventQueue; Object m_abruptInterruptException; - Object m_onIOWaitEnterCallback; - Object m_onIOWaitExitCallback; - Object m_onJoinCallback; - Object m_onResumableCreateCallback; - Object m_onResumableAwaitCallback; - Object m_onResumableSuccessCallback; - Object m_onResumableFailCallback; - Object m_onAwaitAllCreateCallback; - Object m_onGenArrayCreateCallback; - Object m_onGenMapCreateCallback; - Object m_onGenVectorCreateCallback; - Object m_onConditionCreateCallback; - Object m_onExternalThreadEventCreateCallback; - Object m_onExternalThreadEventSuccessCallback; - Object m_onExternalThreadEventFailCallback; - Object m_onSleepCreateCallback; - Object m_onSleepSuccessCallback; + Object m_onIOWaitEnter; + Object m_onIOWaitExit; + Object m_onJoin; + Object m_onResumableCreate; + Object m_onResumableAwait; + Object m_onResumableSuccess; + Object m_onResumableFail; + Object m_onAwaitAllCreate; + Object m_onGenArrayCreate; + Object m_onGenMapCreate; + Object m_onGenVectorCreate; + Object m_onConditionCreate; + Object m_onExtThreadEventCreate; + Object m_onExtThreadEventSuccess; + Object m_onExtThreadEventFail; + Object m_onSleepCreate; + Object m_onSleepSuccess; }; /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/async-function-wait-handle.cpp b/hphp/runtime/ext/asio/async-function-wait-handle.cpp index 33ddef6ad5b..d1254794834 100644 --- a/hphp/runtime/ext/asio/async-function-wait-handle.cpp +++ b/hphp/runtime/ext/asio/async-function-wait-handle.cpp @@ -165,7 +165,7 @@ void c_AsyncFunctionWaitHandle::fail(ObjectData* exception) { assert(exception->instanceof(SystemLib::s_ExceptionClass)); AsioSession* session = AsioSession::Get(); - if (UNLIKELY(session->hasOnResumableFailCallback())) { + if (UNLIKELY(session->hasOnResumableFail())) { try { session->onResumableFail(this, exception); } catch (...) { diff --git a/hphp/runtime/ext/asio/async-generator-wait-handle.cpp b/hphp/runtime/ext/asio/async-generator-wait-handle.cpp index d90610ac9cd..200cbc8e715 100644 --- a/hphp/runtime/ext/asio/async-generator-wait-handle.cpp +++ b/hphp/runtime/ext/asio/async-generator-wait-handle.cpp @@ -139,7 +139,7 @@ void c_AsyncGeneratorWaitHandle::ret(Cell& result) { void c_AsyncGeneratorWaitHandle::fail(ObjectData* exception) { AsioSession* session = AsioSession::Get(); - if (UNLIKELY(session->hasOnResumableFailCallback())) { + if (UNLIKELY(session->hasOnResumableFail())) { session->onResumableFail(this, exception); } diff --git a/hphp/runtime/ext/asio/await-all-wait-handle.cpp b/hphp/runtime/ext/asio/await-all-wait-handle.cpp index 3e703daf6f0..779262837aa 100644 --- a/hphp/runtime/ext/asio/await-all-wait-handle.cpp +++ b/hphp/runtime/ext/asio/await-all-wait-handle.cpp @@ -100,7 +100,7 @@ namespace { } void c_AwaitAllWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnAwaitAllCreateCallback(callback); + AsioSession::Get()->setOnAwaitAllCreate(callback); } Object c_AwaitAllWaitHandle::ti_fromarray(const Array& dependencies) { @@ -266,7 +266,7 @@ void c_AwaitAllWaitHandle::initialize(context_idx_t ctx_idx) { setContextIdx(ctx_idx); assert(m_cur >= 0); - if (UNLIKELY(AsioSession::Get()->hasOnAwaitAllCreateCallback())) { + if (UNLIKELY(AsioSession::Get()->hasOnAwaitAllCreate())) { auto vector = makeSmartPtr(); for (int32_t idx = m_cur; idx >= 0; --idx) { TypedValue child = make_tv(m_children[idx]); diff --git a/hphp/runtime/ext/asio/condition-wait-handle.cpp b/hphp/runtime/ext/asio/condition-wait-handle.cpp index 540133bfb89..3d0c8be36a5 100644 --- a/hphp/runtime/ext/asio/condition-wait-handle.cpp +++ b/hphp/runtime/ext/asio/condition-wait-handle.cpp @@ -43,7 +43,7 @@ namespace { } void c_ConditionWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnConditionCreateCallback(callback); + AsioSession::Get()->setOnConditionCreate(callback); } Object c_ConditionWaitHandle::ti_create(const Variant& child) { @@ -115,7 +115,7 @@ void c_ConditionWaitHandle::initialize(c_WaitableWaitHandle* child) { incRefCount(); auto const session = AsioSession::Get(); - if (UNLIKELY(session->hasOnConditionCreateCallback())) { + if (UNLIKELY(session->hasOnConditionCreate())) { session->onConditionCreate(this, child); } } diff --git a/hphp/runtime/ext/asio/external-thread-event-wait-handle.cpp b/hphp/runtime/ext/asio/external-thread-event-wait-handle.cpp index 4709bf47fd5..78161cbfb3b 100644 --- a/hphp/runtime/ext/asio/external-thread-event-wait-handle.cpp +++ b/hphp/runtime/ext/asio/external-thread-event-wait-handle.cpp @@ -34,19 +34,19 @@ namespace { void c_ExternalThreadEventWaitHandle::ti_setoncreatecallback( const Variant& callback ) { - AsioSession::Get()->setOnExternalThreadEventCreateCallback(callback); + AsioSession::Get()->setOnExternalThreadEventCreate(callback); } void c_ExternalThreadEventWaitHandle::ti_setonsuccesscallback( const Variant& callback ) { - AsioSession::Get()->setOnExternalThreadEventSuccessCallback(callback); + AsioSession::Get()->setOnExternalThreadEventSuccess(callback); } void c_ExternalThreadEventWaitHandle::ti_setonfailcallback( const Variant& callback ) { - AsioSession::Get()->setOnExternalThreadEventFailCallback(callback); + AsioSession::Get()->setOnExternalThreadEventFail(callback); } void c_ExternalThreadEventWaitHandle::sweep() { @@ -90,7 +90,7 @@ void c_ExternalThreadEventWaitHandle::initialize( registerToContext(); } - if (UNLIKELY(session->hasOnExternalThreadEventCreateCallback())) { + if (UNLIKELY(session->hasOnExternalThreadEventCreate())) { session->onExternalThreadEventCreate(this); } } @@ -143,7 +143,7 @@ void c_ExternalThreadEventWaitHandle::process() { parentChain.unblock(); auto session = AsioSession::Get(); - if (UNLIKELY(session->hasOnExternalThreadEventFailCallback())) { + if (UNLIKELY(session->hasOnExternalThreadEventFail())) { session->onExternalThreadEventFail(this, exception); } return; @@ -163,7 +163,7 @@ void c_ExternalThreadEventWaitHandle::process() { parentChain.unblock(); auto session = AsioSession::Get(); - if (UNLIKELY(session->hasOnExternalThreadEventSuccessCallback())) { + if (UNLIKELY(session->hasOnExternalThreadEventSuccess())) { session->onExternalThreadEventSuccess(this, tvAsCVarRef(&result)); } } diff --git a/hphp/runtime/ext/asio/gen-array-wait-handle.cpp b/hphp/runtime/ext/asio/gen-array-wait-handle.cpp index 3eef6a4889e..361f872aa54 100644 --- a/hphp/runtime/ext/asio/gen-array-wait-handle.cpp +++ b/hphp/runtime/ext/asio/gen-array-wait-handle.cpp @@ -44,7 +44,7 @@ namespace { } void c_GenArrayWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnGenArrayCreateCallback(callback); + AsioSession::Get()->setOnGenArrayCreate(callback); } NEVER_INLINE __attribute__((__noreturn__)) @@ -124,7 +124,7 @@ Object c_GenArrayWaitHandle::ti_create(const Array& inputDependencies) { my_wh->initialize(exception, depCopy, current_pos, ctx_idx, child_wh); auto const session = AsioSession::Get(); - if (UNLIKELY(session->hasOnGenArrayCreateCallback())) { + if (UNLIKELY(session->hasOnGenArrayCreate())) { session->onGenArrayCreate(my_wh.get(), inputDependencies); } diff --git a/hphp/runtime/ext/asio/gen-map-wait-handle.cpp b/hphp/runtime/ext/asio/gen-map-wait-handle.cpp index 27e1ce88b86..7c209cac3a1 100644 --- a/hphp/runtime/ext/asio/gen-map-wait-handle.cpp +++ b/hphp/runtime/ext/asio/gen-map-wait-handle.cpp @@ -42,7 +42,7 @@ namespace { } void c_GenMapWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnGenMapCreateCallback(callback); + AsioSession::Get()->setOnGenMapCreate(callback); } Object c_GenMapWaitHandle::ti_create(const Variant& dependencies) { @@ -101,7 +101,7 @@ Object c_GenMapWaitHandle::ti_create(const Variant& dependencies) { my_wh->initialize(exception, deps.get(), iter_pos, ctx_idx, child_wh); AsioSession* session = AsioSession::Get(); - if (UNLIKELY(session->hasOnGenMapCreateCallback())) { + if (UNLIKELY(session->hasOnGenMapCreate())) { session->onGenMapCreate(my_wh.get(), dependencies); } diff --git a/hphp/runtime/ext/asio/gen-vector-wait-handle.cpp b/hphp/runtime/ext/asio/gen-vector-wait-handle.cpp index 8479e65618e..e3a7abf58dc 100644 --- a/hphp/runtime/ext/asio/gen-vector-wait-handle.cpp +++ b/hphp/runtime/ext/asio/gen-vector-wait-handle.cpp @@ -43,7 +43,7 @@ namespace { } void c_GenVectorWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnGenVectorCreateCallback(callback); + AsioSession::Get()->setOnGenVectorCreate(callback); } Object c_GenVectorWaitHandle::ti_create(const Variant& dependencies) { @@ -96,7 +96,7 @@ Object c_GenVectorWaitHandle::ti_create(const Variant& dependencies) { auto my_wh = makeSmartPtr(); my_wh->initialize(exception, deps.get(), iter_pos, ctx_idx, child_wh); AsioSession* session = AsioSession::Get(); - if (UNLIKELY(session->hasOnGenVectorCreateCallback())) { + if (UNLIKELY(session->hasOnGenVectorCreate())) { session->onGenVectorCreate(my_wh.get(), dependencies); } return Object(std::move(my_wh)); diff --git a/hphp/runtime/ext/asio/resumable-wait-handle.cpp b/hphp/runtime/ext/asio/resumable-wait-handle.cpp index 7166a2fb1de..6fd315c340e 100644 --- a/hphp/runtime/ext/asio/resumable-wait-handle.cpp +++ b/hphp/runtime/ext/asio/resumable-wait-handle.cpp @@ -28,19 +28,19 @@ namespace HPHP { /////////////////////////////////////////////////////////////////////////////// void c_ResumableWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnResumableCreateCallback(callback); + AsioSession::Get()->setOnResumableCreate(callback); } void c_ResumableWaitHandle::ti_setonawaitcallback(const Variant& callback) { - AsioSession::Get()->setOnResumableAwaitCallback(callback); + AsioSession::Get()->setOnResumableAwait(callback); } void c_ResumableWaitHandle::ti_setonsuccesscallback(const Variant& callback) { - AsioSession::Get()->setOnResumableSuccessCallback(callback); + AsioSession::Get()->setOnResumableSuccess(callback); } void c_ResumableWaitHandle::ti_setonfailcallback(const Variant& callback) { - AsioSession::Get()->setOnResumableFailCallback(callback); + AsioSession::Get()->setOnResumableFail(callback); } c_ResumableWaitHandle* c_ResumableWaitHandle::getRunning(ActRec* fp) { diff --git a/hphp/runtime/ext/asio/sleep-wait-handle.cpp b/hphp/runtime/ext/asio/sleep-wait-handle.cpp index 5a5181e5083..173ff9a53b7 100644 --- a/hphp/runtime/ext/asio/sleep-wait-handle.cpp +++ b/hphp/runtime/ext/asio/sleep-wait-handle.cpp @@ -31,11 +31,11 @@ namespace { } void c_SleepWaitHandle::ti_setoncreatecallback(const Variant& callback) { - AsioSession::Get()->setOnSleepCreateCallback(callback); + AsioSession::Get()->setOnSleepCreate(callback); } void c_SleepWaitHandle::ti_setonsuccesscallback(const Variant& callback) { - AsioSession::Get()->setOnSleepSuccessCallback(callback); + AsioSession::Get()->setOnSleepSuccess(callback); } Object c_SleepWaitHandle::ti_create(int64_t usecs) { @@ -66,7 +66,7 @@ void c_SleepWaitHandle::initialize(int64_t usecs) { registerToContext(); } - if (UNLIKELY(session->hasOnSleepCreateCallback())) { + if (UNLIKELY(session->hasOnSleepCreate())) { session->onSleepCreate(this); } } @@ -84,7 +84,7 @@ void c_SleepWaitHandle::process() { parentChain.unblock(); auto session = AsioSession::Get(); - if (UNLIKELY(session->hasOnSleepSuccessCallback())) { + if (UNLIKELY(session->hasOnSleepSuccess())) { session->onSleepSuccess(this); } } diff --git a/hphp/runtime/ext/asio/wait-handle.cpp b/hphp/runtime/ext/asio/wait-handle.cpp index b5db980d67c..1d0d1b54ace 100644 --- a/hphp/runtime/ext/asio/wait-handle.cpp +++ b/hphp/runtime/ext/asio/wait-handle.cpp @@ -34,15 +34,15 @@ void c_WaitHandle::t___construct() { } void c_WaitHandle::ti_setoniowaitentercallback(const Variant& callback) { - AsioSession::Get()->setOnIOWaitEnterCallback(callback); + AsioSession::Get()->setOnIOWaitEnter(callback); } void c_WaitHandle::ti_setoniowaitexitcallback(const Variant& callback) { - AsioSession::Get()->setOnIOWaitExitCallback(callback); + AsioSession::Get()->setOnIOWaitExit(callback); } void c_WaitHandle::ti_setonjoincallback(const Variant& callback) { - AsioSession::Get()->setOnJoinCallback(callback); + AsioSession::Get()->setOnJoin(callback); } Object c_WaitHandle::t_getwaithandle() { diff --git a/hphp/runtime/ext/asio/waitable-wait-handle.cpp b/hphp/runtime/ext/asio/waitable-wait-handle.cpp index bd555503e34..07bc22183a4 100644 --- a/hphp/runtime/ext/asio/waitable-wait-handle.cpp +++ b/hphp/runtime/ext/asio/waitable-wait-handle.cpp @@ -65,7 +65,7 @@ void c_WaitableWaitHandle::join() { assert(!isFinished()); AsioSession* session = AsioSession::Get(); - if (UNLIKELY(session->hasOnJoinCallback())) { + if (UNLIKELY(session->hasOnJoin())) { session->onJoin(this); } diff --git a/hphp/runtime/vm/event-hook.cpp b/hphp/runtime/vm/event-hook.cpp index 85eed4817d9..bc3c38af8f3 100644 --- a/hphp/runtime/vm/event-hook.cpp +++ b/hphp/runtime/vm/event-hook.cpp @@ -425,7 +425,7 @@ void EventHook::onFunctionSuspendR(ActRec* suspending, ObjectData* child) { assert(suspending->resumed()); auto const afwh = frame_afwh(suspending); auto const session = AsioSession::Get(); - if (session->hasOnResumableAwaitCallback()) { + if (session->hasOnResumableAwait()) { session->onResumableAwait( afwh, static_cast(child) @@ -453,7 +453,7 @@ void EventHook::onFunctionSuspendE(ActRec* suspending, assert(resumableAR->resumed()); auto const afwh = frame_afwh(resumableAR); auto const session = AsioSession::Get(); - if (session->hasOnResumableCreateCallback()) { + if (session->hasOnResumableCreate()) { session->onResumableCreate(afwh, afwh->getChild()); } } @@ -485,7 +485,7 @@ void EventHook::onFunctionReturn(ActRec* ar, TypedValue retval) { ar->func()->isAsyncFunction() && ar->resumed()) { auto session = AsioSession::Get(); // Return @ resumed execution => AsyncFunctionWaitHandle succeeded. - if (session->hasOnResumableSuccessCallback()) { + if (session->hasOnResumableSuccess()) { auto afwh = frame_afwh(ar); session->onResumableSuccess(afwh, cellAsCVarRef(retval)); } -- 2.11.4.GIT