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

Bug 1020290 - move notions of 'nursery' out of ThreadSafeContext, rename 'fjNursery'. r=shu

Browse Source
This commit is contained in:
Lars T Hansen
2014-06-26 09:21:52 +02:00
parent c4c662cf55
commit c67095bdd1
8 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/jsobj.cpp
View File

@@ -2836,7 +2836,7 @@ AllocateSlots(ThreadSafeContext *cx, JSObject *obj, uint32_t nslots)
#endif
#ifdef JSGC_FJGENERATIONAL
if (cx->isForkJoinContext())
return cx->asForkJoinContext()->fjNursery().allocateSlots(obj, nslots);
return cx->asForkJoinContext()->nursery().allocateSlots(obj, nslots);
#endif
return cx->pod_malloc<HeapSlot>(nslots);
}
@@ -2858,8 +2858,8 @@ ReallocateSlots(ThreadSafeContext *cx, JSObject *obj, HeapSlot *oldSlots,
#endif
#ifdef JSGC_FJGENERATIONAL
if (cx->isForkJoinContext()) {
return cx->asForkJoinContext()->fjNursery().reallocateSlots(obj, oldSlots,
oldCount, newCount);
return cx->asForkJoinContext()->nursery().reallocateSlots(obj, oldSlots,
oldCount, newCount);
}
#endif
return (HeapSlot *)cx->realloc_(oldSlots, oldCount * sizeof(HeapSlot),
@@ -2938,7 +2938,7 @@ FreeSlots(ThreadSafeContext *cx, HeapSlot *slots)
#endif
#ifdef JSGC_FJGENERATIONAL
if (cx->isForkJoinContext())
return cx->asForkJoinContext()->fjNursery().freeSlots(slots);
return cx->asForkJoinContext()->nursery().freeSlots(slots);
#endif
js_free(slots);
}
@@ -3166,7 +3166,7 @@ AllocateElements(ThreadSafeContext *cx, JSObject *obj, uint32_t nelems)
#endif
#ifdef JSGC_FJGENERATIONAL
if (cx->isForkJoinContext())
return cx->asForkJoinContext()->fjNursery().allocateElements(obj, nelems);
return cx->asForkJoinContext()->nursery().allocateElements(obj, nelems);
#endif
return static_cast<js::ObjectElements *>(cx->malloc_(nelems * sizeof(HeapValue)));
@@ -3187,8 +3187,8 @@ ReallocateElements(ThreadSafeContext *cx, JSObject *obj, ObjectElements *oldHead
#endif
#ifdef JSGC_FJGENERATIONAL
if (cx->isForkJoinContext()) {
return cx->asForkJoinContext()->fjNursery().reallocateElements(obj, oldHeader,
oldCount, newCount);
return cx->asForkJoinContext()->nursery().reallocateElements(obj, oldHeader,
oldCount, newCount);
}
#endif