mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
95 lines
2.4 KiB
C++
95 lines
2.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef mozilla_SyncRunnable_h
|
|
#define mozilla_SyncRunnable_h
|
|
|
|
#include "nsThreadUtils.h"
|
|
#include "mozilla/Monitor.h"
|
|
|
|
namespace mozilla {
|
|
|
|
/**
|
|
* This class will wrap a nsIRunnable and dispatch it to the main thread
|
|
* synchronously. This is different from nsIEventTarget.DISPATCH_SYNC:
|
|
* this class does not spin the event loop waiting for the event to be
|
|
* dispatched. This means that you don't risk reentrance from pending
|
|
* messages, but you must be sure that the target thread does not ever block
|
|
* on this thread, or else you will deadlock.
|
|
*
|
|
* Typical usage:
|
|
* RefPtr<SyncRunnable> sr = new SyncRunnable(new myrunnable...());
|
|
* sr->DispatchToThread(t);
|
|
*
|
|
* We also provide a convenience wrapper:
|
|
* SyncRunnable::DispatchToThread(new myrunnable...());
|
|
*
|
|
*/
|
|
class SyncRunnable : public nsRunnable
|
|
{
|
|
public:
|
|
explicit SyncRunnable(nsIRunnable* aRunnable)
|
|
: mRunnable(aRunnable)
|
|
, mMonitor("SyncRunnable")
|
|
, mDone(false)
|
|
{
|
|
}
|
|
|
|
void DispatchToThread(nsIEventTarget* aThread, bool aForceDispatch = false)
|
|
{
|
|
nsresult rv;
|
|
bool on;
|
|
|
|
if (!aForceDispatch) {
|
|
rv = aThread->IsOnCurrentThread(&on);
|
|
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
|
if (NS_SUCCEEDED(rv) && on) {
|
|
mRunnable->Run();
|
|
return;
|
|
}
|
|
}
|
|
|
|
rv = aThread->Dispatch(this, NS_DISPATCH_NORMAL);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
|
while (!mDone) {
|
|
lock.Wait();
|
|
}
|
|
}
|
|
}
|
|
|
|
static void DispatchToThread(nsIEventTarget* aThread,
|
|
nsIRunnable* aRunnable,
|
|
bool aForceDispatch = false)
|
|
{
|
|
RefPtr<SyncRunnable> s(new SyncRunnable(aRunnable));
|
|
s->DispatchToThread(aThread, aForceDispatch);
|
|
}
|
|
|
|
protected:
|
|
NS_IMETHODIMP Run()
|
|
{
|
|
mRunnable->Run();
|
|
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
|
MOZ_ASSERT(!mDone);
|
|
|
|
mDone = true;
|
|
mMonitor.Notify();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
nsCOMPtr<nsIRunnable> mRunnable;
|
|
mozilla::Monitor mMonitor;
|
|
bool mDone;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_SyncRunnable_h
|