1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
$NetBSD: patch-js__src__jsgc.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242,
https://hg.mozilla.org/integration/mozilla-inbound/rev/49e4ff129351
Use the runtime page size to control arena decommit.
As a side effect, this removes the hard coded page-size == 4k requirement.
diff js/src/jsgc.cpp js/src/jsgc.cpp
--- js/src/jsgc.cpp.orig 2013-05-11 21:19:34.000000000 +0200
+++ js/src/jsgc.cpp 2013-06-10 13:49:13.000000000 +0200
@@ -465,13 +465,15 @@ FinalizeArenas(FreeOp *fop,
}
static inline Chunk *
-AllocChunk() {
- return static_cast<Chunk *>(MapAlignedPages(ChunkSize, ChunkSize));
+AllocChunk(JSRuntime *rt)
+{
+ return static_cast<Chunk *>(MapAlignedPages(rt, ChunkSize, ChunkSize));
}
static inline void
-FreeChunk(Chunk *p) {
- UnmapPages(static_cast<void *>(p), ChunkSize);
+FreeChunk(JSRuntime *rt, Chunk *p)
+{
+ UnmapPages(rt, static_cast<void *>(p), ChunkSize);
}
inline bool
@@ -561,25 +563,25 @@ ChunkPool::expire(JSRuntime *rt, bool re
}
static void
-FreeChunkList(Chunk *chunkListHead)
+FreeChunkList(JSRuntime *rt, Chunk *chunkListHead)
{
while (Chunk *chunk = chunkListHead) {
JS_ASSERT(!chunk->info.numArenasFreeCommitted);
chunkListHead = chunk->info.next;
- FreeChunk(chunk);
+ FreeChunk(rt, chunk);
}
}
void
ChunkPool::expireAndFree(JSRuntime *rt, bool releaseAll)
{
- FreeChunkList(expire(rt, releaseAll));
+ FreeChunkList(rt, expire(rt, releaseAll));
}
/* static */ Chunk *
Chunk::allocate(JSRuntime *rt)
{
- Chunk *chunk = static_cast<Chunk *>(AllocChunk());
+ Chunk *chunk = AllocChunk(rt);
#ifdef JSGC_ROOT_ANALYSIS
// Our poison pointers are not guaranteed to be invalid on 64-bit
@@ -592,7 +594,7 @@ Chunk::allocate(JSRuntime *rt)
// were marked as uncommitted, but it's a little complicated to avoid
// clobbering pre-existing unrelated mappings.
while (IsPoisonedPtr(chunk))
- chunk = static_cast<Chunk *>(AllocChunk());
+ chunk = AllocChunk(rt);
#endif
if (!chunk)
@@ -608,7 +610,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu
{
JS_ASSERT(chunk);
chunk->prepareToBeFreed(rt);
- FreeChunk(chunk);
+ FreeChunk(rt, chunk);
}
inline void
@@ -736,7 +738,7 @@ Chunk::fetchNextDecommittedArena()
decommittedArenas.unset(offset);
Arena *arena = &arenas[offset];
- MarkPagesInUse(arena, ArenaSize);
+ MarkPagesInUse(info.runtime, arena, ArenaSize);
arena->aheader.setAsNotAllocated();
return &arena->aheader;
@@ -937,6 +939,8 @@ static const int64_t JIT_SCRIPT_RELEASE_
JSBool
js_InitGC(JSRuntime *rt, uint32_t maxbytes)
{
+ InitMemorySubsystem(rt);
+
if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY))
return false;
@@ -2051,6 +2055,9 @@ js::MaybeGC(JSContext *cx)
static void
DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp)
{
+ if (!DecommitEnabled(rt))
+ return;
+
Chunk *chunk = *availableListHeadp;
if (!chunk)
return;
@@ -2102,7 +2109,7 @@ DecommitArenasFromAvailableList(JSRuntim
Maybe<AutoUnlockGC> maybeUnlock;
if (!rt->isHeapBusy())
maybeUnlock.construct(rt);
- ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
+ ok = MarkPagesUnused(rt, aheader->getArena(), ArenaSize);
}
if (ok) {
@@ -2132,7 +2139,7 @@ DecommitArenasFromAvailableList(JSRuntim
JS_ASSERT(chunk->info.prevp);
}
- if (rt->gcChunkAllocationSinceLastGC) {
+ if (rt->gcChunkAllocationSinceLastGC || !ok) {
/*
* The allocator thread has started to get new chunks. We should stop
* to avoid decommitting arenas in just allocated chunks.
@@ -2170,7 +2177,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo
{
if (Chunk *toFree = rt->gcChunkPool.expire(rt, shouldShrink)) {
AutoUnlockGC unlock(rt);
- FreeChunkList(toFree);
+ FreeChunkList(rt, toFree);
}
if (shouldShrink)
|
