corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1470151) for build bustage at testing/xpcshell/selftest.py on a CLOSED TREE

Browse Source 
Backed out changeset c73f394a4bef (bug 1470151)
Backed out changeset 3579431e03dc (bug 1470151)
Backed out changeset ddde7dd347d4 (bug 1470151)
This commit is contained in:
Coroiu Cristina
2018-06-27 16:57:10 +03:00
parent 6d64a9838d
commit de9b32d20d
11 changed files with 28 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
tools/code-coverage/nsCodeCoverage.cpp
View File

@@ -7,11 +7,9 @@
#include "mozilla/CodeCoverageHandler.h"
#include "mozilla/Unused.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/Promise.h"
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::ipc;
NS_IMPL_ISUPPORTS(nsCodeCoverage,
nsICodeCoverage)
@@ -24,82 +22,28 @@ nsCodeCoverage::~nsCodeCoverage()
{
}
enum RequestType { Dump, Reset };
class ProcessCount final {
NS_INLINE_DECL_REFCOUNTING(ProcessCount);
public:
ProcessCount(uint32_t c) : mCount(c) {}
operator uint32_t() const { return mCount; }
ProcessCount& operator--() { mCount--; return *this; }
private:
~ProcessCount() {}
uint32_t mCount;
};
nsresult Request(JSContext* cx, Promise** aPromise, RequestType requestType)
NS_IMETHODIMP nsCodeCoverage::DumpCounters()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(NS_IsMainThread());
nsIGlobalObject* global = xpc::NativeGlobal(JS::CurrentGlobalOrNull(cx));
if (NS_WARN_IF(!global)) {
return NS_ERROR_FAILURE;
}
ErrorResult result;
RefPtr<Promise> promise = Promise::Create(global, result);
if (NS_WARN_IF(result.Failed())) {
return result.StealNSResult();
}
uint32_t processCount = 0;
CodeCoverageHandler::DumpCounters(0);
for (auto* cp : ContentParent::AllProcesses(ContentParent::eLive)) {
++processCount;
Unused << cp->SendDumpCodeCoverageCounters();
}
if (requestType == RequestType::Dump) {
CodeCoverageHandler::DumpCounters();
} else if (requestType == RequestType::Reset) {
CodeCoverageHandler::ResetCounters();
}
if (processCount == 0) {
promise->MaybeResolveWithUndefined();
} else {
RefPtr<ProcessCount> processCountHolder(new ProcessCount(processCount));
auto resolve = [processCountHolder, promise](bool unused) {
if (--(*processCountHolder) == 0) {
promise->MaybeResolveWithUndefined();
}
};
auto reject = [promise](ResponseRejectReason aReason) {
promise->MaybeReject(NS_ERROR_FAILURE);
};
for (auto* cp : ContentParent::AllProcesses(ContentParent::eLive)) {
if (requestType == RequestType::Dump) {
cp->SendDumpCodeCoverageCounters(resolve, reject);
} else if (requestType == RequestType::Reset) {
cp->SendResetCodeCoverageCounters(resolve, reject);
}
}
}
promise.forget(aPromise);
return NS_OK;
}
NS_IMETHODIMP nsCodeCoverage::DumpCounters(JSContext *cx, Promise** aPromise)
NS_IMETHODIMP nsCodeCoverage::ResetCounters()
{
return Request(cx, aPromise, RequestType::Dump);
}
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(NS_IsMainThread());
NS_IMETHODIMP nsCodeCoverage::ResetCounters(JSContext *cx, Promise** aPromise)
{
return Request(cx, aPromise, RequestType::Reset);
CodeCoverageHandler::ResetCounters(0);
for (auto* cp : ContentParent::AllProcesses(ContentParent::eLive)) {
Unused << cp->SendResetCodeCoverageCounters();
}
return NS_OK;
}