wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1145824 - Add getElapsedTime to nsIProfiler. (r=mstange)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-04-24 17:30:58 -07:00
parent 6b51a17c80
commit c4425927eb
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/profiler/nsIProfiler.idl
View File

@ -12,7 +12,7 @@ class nsCString;
[ref] native StringArrayRef(const nsTArray<nsCString>);
[scriptable, uuid(edd65f3f-c2a2-4217-a2e2-40347ba4a2b3)]
[scriptable, uuid(9c3c0534-ef4b-4a6e-a1a6-4522d4824ac8)]
interface nsIProfiler : nsISupports
{
void StartProfiler(in uint32_t aEntries, in double aInterval,
@ -34,6 +34,12 @@ interface nsIProfiler : nsISupports
void GetBufferInfo(out uint32_t aCurrentPosition, out uint32_t aTotalSize,
out uint32_t aGeneration);
/**
* Returns the elapsed time, in milliseconds, since the last StartProfiler call.
* Returns 0 if there is no active sampler.
*/
float getElapsedTime();
/**
* Returns a JSON string of an array of shared library objects.
* Every object has three properties: start, end, and name.

12
tools/profiler/nsProfiler.cpp
View File

@ -201,8 +201,9 @@ nsProfiler::DumpProfileToFile(const char* aFilename)
return NS_OK;
}
NS_IMETHODIMP nsProfiler::GetProfileData(JSContext* aCx,
JS::MutableHandle<JS::Value> aResult)
NS_IMETHODIMP
nsProfiler::GetProfileData(JSContext* aCx,
JS::MutableHandle<JS::Value> aResult)
{
JS::RootedObject obj(aCx, profiler_get_profile_jsobject(aCx));
if (!obj) {
@ -212,6 +213,13 @@ NS_IMETHODIMP nsProfiler::GetProfileData(JSContext* aCx,
return NS_OK;
}
NS_IMETHODIMP
nsProfiler::GetElapsedTime(float* aElapsedTime)
{
*aElapsedTime = static_cast<float>(profiler_time());
return NS_OK;
}
NS_IMETHODIMP
nsProfiler::IsActive(bool *aIsActive)
{