ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-15 01:10:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

more GC stress fixes

Browse Source
This commit is contained in:
Joel Dice 2007-07-16 18:23:23 -06:00
parent 6dec1cbd42
commit 6bac351874
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/heap.cpp
View File

@ -1419,7 +1419,8 @@ makeHeap(System* system)
return Reachable; return Reachable;
} else if (c.nextGen2.contains(p) } else if (c.nextGen2.contains(p)
or (c.gen2.contains(p) or (c.gen2.contains(p)
and c.gen2.indexOf(p) >= c.gen2Base)) and (c.mode == ::MinorCollection
or c.gen2.indexOf(p) >= c.gen2Base)))
{ {
return Tenured; return Tenured;
} else if (wasCollected(&c, p)) { } else if (wasCollected(&c, p)) {

8
src/machine.cpp
View File

@ -1341,6 +1341,11 @@ Thread::dispose()
systemThread = 0; systemThread = 0;
} }
#ifdef VM_STRESS
vm->system->free(heap);
heap = 0;
#endif // VM_STRESS
if (allocator) { if (allocator) {
allocator->free(this); allocator->free(this);
} }
@ -1377,7 +1382,8 @@ enter(Thread* t, Thread::State s)
switch (s) { switch (s) {
case Thread::ExclusiveState: { case Thread::ExclusiveState: {
assert(t, t->state == Thread::ActiveState); assert(t, t->state == Thread::ActiveState
or t->state == Thread::ExitState);
while (t->vm->exclusive) { while (t->vm->exclusive) {
// another thread got here first. // another thread got here first.

7
src/machine.h
View File

@ -22,7 +22,7 @@
namespace vm { namespace vm {
const bool Verbose = false; const bool Verbose = false;
const bool DebugRun = true; const bool DebugRun = false;
const bool DebugStack = false; const bool DebugStack = false;
const bool DebugMonitors = false; const bool DebugMonitors = false;
@ -1221,7 +1221,10 @@ collect(Thread* t, Heap::CollectionType type);
inline void inline void
stress(Thread* t) stress(Thread* t)
{ {
if ((not t->stress) and t->state != Thread::NoState) { if ((not t->stress)
and t->state != Thread::NoState
and t->state != Thread::IdleState)
{
t->stress = true; t->stress = true;
{ ENTER(t, Thread::ExclusiveState); { ENTER(t, Thread::ExclusiveState);

2
src/run.cpp
View File

@ -396,6 +396,8 @@ invokeNative(Thread* t, object method)
return VoidField; return VoidField;
} }
PROTECT(t, data);
pushFrame(t, method); pushFrame(t, method);
unsigned count = methodParameterCount(t, method); unsigned count = methodParameterCount(t, method);