Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1298541: Small cleanups to TraceLoggerDrain methods; r=h4writer

Browse Source 
MozReview-Commit-ID: IDgSLJ7dbmW

--HG--
extra : rebase_source : 9a237194058b2760f3264fdc82c3d85b4ad3d0b0
This commit is contained in:
Benjamin Bouvier 2016-09-02 11:58:47 +02:00
parent af708bb8a6
commit ae8611942d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/vm/Debugger.cpp
View File

@ -4886,28 +4886,29 @@ bool
Debugger::drainTraceLogger(JSContext* cx, unsigned argc, Value* vp)
{
THIS_DEBUGGER(cx, argc, vp, "drainTraceLogger", args, dbg);
if (!args.requireAtLeast(cx, "Debugger.drainTraceLogger", 0))
return false;
size_t num;
TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
bool lostEvents = logger->lostEvents(dbg->traceLoggerLastDrainedIteration,
dbg->traceLoggerLastDrainedSize);
size_t numEvents;
EventEntry* events = logger->getEventsStartingAt(&dbg->traceLoggerLastDrainedIteration,
&dbg->traceLoggerLastDrainedSize,
&num);
&numEvents);
RootedObject array(cx, NewDenseEmptyArray(cx));
JSAtom* dataAtom = Atomize(cx, "data", strlen("data"));
if (!array)
return false;
JSAtom* dataAtom = Atomize(cx, "data", strlen("data"));
if (!dataAtom)
return false;
RootedId dataId(cx, AtomToId(dataAtom));
/* Add all events to the array. */
uint32_t index = 0;
for (EventEntry* eventItem = events; eventItem < events + num; eventItem++, index++) {
for (EventEntry* eventItem = events; eventItem < events + numEvents; eventItem++, index++) {
RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, nullptr));
if (!item)
return false;
@ -5037,32 +5038,33 @@ bool
Debugger::drainTraceLoggerScriptCalls(JSContext* cx, unsigned argc, Value* vp)
{
THIS_DEBUGGER(cx, argc, vp, "drainTraceLoggerScriptCalls", args, dbg);
if (!args.requireAtLeast(cx, "Debugger.drainTraceLoggerScriptCalls", 0))
return false;
size_t num;
TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
bool lostEvents = logger->lostEvents(dbg->traceLoggerScriptedCallsLastDrainedIteration,
dbg->traceLoggerScriptedCallsLastDrainedSize);
size_t numEvents;
EventEntry* events = logger->getEventsStartingAt(
&dbg->traceLoggerScriptedCallsLastDrainedIteration,
&dbg->traceLoggerScriptedCallsLastDrainedSize,
&num);
&numEvents);
RootedObject array(cx, NewDenseEmptyArray(cx));
if (!array)
return false;
RootedId fileNameId(cx, AtomToId(cx->names().fileName));
RootedId lineNumberId(cx, AtomToId(cx->names().lineNumber));
RootedId columnNumberId(cx, AtomToId(cx->names().columnNumber));
JSAtom* logTypeAtom = Atomize(cx, "logType", strlen("logType"));
if (!logTypeAtom)
return false;
RootedId fileNameId(cx, AtomToId(cx->names().fileName));
RootedId lineNumberId(cx, AtomToId(cx->names().lineNumber));
RootedId columnNumberId(cx, AtomToId(cx->names().columnNumber));
RootedId logTypeId(cx, AtomToId(logTypeAtom));
/* Add all events to the array. */
uint32_t index = 0;
for (EventEntry* eventItem = events; eventItem < events + num; eventItem++) {
for (EventEntry* eventItem = events; eventItem < events + numEvents; eventItem++) {
RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, nullptr));
if (!item)
return false;