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

fix heapdump=true build

Browse Source
This commit is contained in:
Joel Dice 2014-07-16 14:18:42 -06:00
parent 00340cdc6b
commit cae4b49005
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -1869,7 +1869,8 @@ executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects) $(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
unittest-executable-objects = $(unittest-objects) $(vm-objects) \ unittest-executable-objects = $(unittest-objects) $(vm-objects) \
$(build)/util/arg-parser.o $(stub-objects) $(lzma-decode-objects) $(vm-heapwalk-objects) $(build)/util/arg-parser.o $(stub-objects) \
$(lzma-decode-objects)
ifeq ($(process),interpret) ifeq ($(process),interpret)
unittest-executable-objects += $(all-codegen-target-objects) unittest-executable-objects += $(all-codegen-target-objects)

5
src/builtin.cpp
View File

@ -286,9 +286,10 @@ extern "C" AVIAN_EXPORT int64_t JNICALL
extern "C" AVIAN_EXPORT void JNICALL extern "C" AVIAN_EXPORT void JNICALL
Avian_avian_Machine_dumpHeap(Thread* t, object, uintptr_t* arguments) Avian_avian_Machine_dumpHeap(Thread* t, object, uintptr_t* arguments)
{ {
object outputFile = reinterpret_cast<object>(*arguments); GcString* outputFile
= static_cast<GcString*>(reinterpret_cast<object>(*arguments));
unsigned length = stringLength(t, outputFile); unsigned length = outputFile->length(t);
THREAD_RUNTIME_ARRAY(t, char, n, length + 1); THREAD_RUNTIME_ARRAY(t, char, n, length + 1);
stringChars(t, outputFile, RUNTIME_ARRAY_BODY(n)); stringChars(t, outputFile, RUNTIME_ARRAY_BODY(n));
FILE* out = vm::fopen(RUNTIME_ARRAY_BODY(n), "wb"); FILE* out = vm::fopen(RUNTIME_ARRAY_BODY(n), "wb");

5
src/heapdump.cpp
View File

@ -74,11 +74,10 @@ void dumpHeap(Thread* t, FILE* out)
local::write4(out, local::objectSize(t, p)); local::write4(out, local::objectSize(t, p));
if (objectClass(t, p) == type(t, GcClass::Type)) { if (objectClass(t, p) == type(t, GcClass::Type)) {
object name = className(t, p); GcByteArray* name = static_cast<GcClass*>(p)->name();
if (name) { if (name) {
local::write1(out, local::ClassName); local::write1(out, local::ClassName);
local::writeString( local::writeString(out, name->body().begin(), name->length() - 1);
out, &byteArrayBody(t, name, 0), byteArrayLength(t, name) - 1);
} }
} }

2
test/ci.sh
View File

@ -30,5 +30,5 @@ if [ -z "${openjdk}" ]; then
run make openjdk=$JAVA_HOME ${flags} ${test_target} run make openjdk=$JAVA_HOME ${flags} ${test_target}
fi fi
fi fi
run make ${flags} tails=true continuations=true ${test_target} run make ${flags} tails=true continuations=true heapdump=true ${test_target}
run make ${flags} codegen-targets=all run make ${flags} codegen-targets=all