Skip to content

Commit

Permalink
Merge pull request #9134 from fjeremic/jitdump-improvements-9133
Browse files Browse the repository at this point in the history
Consolidate jitdump functionality into JitDump.cpp
  • Loading branch information
mpirvu committed Apr 8, 2020
2 parents a286546 + af69312 commit 443422e
Show file tree
Hide file tree
Showing 7 changed files with 731 additions and 671 deletions.
1 change: 1 addition & 0 deletions runtime/compiler/build/files/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ JIT_PRODUCT_SOURCE_FILES+=\
compiler/control/DLLMain.cpp \
compiler/control/HookedByTheJit.cpp \
compiler/control/J9Options.cpp \
compiler/control/JitDump.cpp \
compiler/control/MethodToBeCompiled.cpp \
compiler/control/rossa.cpp \
compiler/env/ClassLoaderTable.cpp \
Expand Down
1 change: 1 addition & 0 deletions runtime/compiler/control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ j9jit_files(
control/HookedByTheJit.cpp
control/J9Options.cpp
control/J9Recompilation.cpp
control/JitDump.cpp
control/MethodToBeCompiled.cpp
control/rossa.cpp
)
Expand Down
14 changes: 1 addition & 13 deletions runtime/compiler/control/CompilationThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "codegen/PrivateLinkage.hpp"
#include "compile/CompilationTypes.hpp"
#include "compile/ResolvedMethod.hpp"
#include "control/JitDump.hpp"
#include "control/Recompilation.hpp"
#include "control/RecompilationInfo.hpp"
#include "control/MethodToBeCompiled.hpp"
Expand Down Expand Up @@ -194,19 +195,6 @@ TR::CompilationInfoPerThreadBase::setCompilation(TR::Compilation *compiler)
_compiler = compiler;
}

#ifdef J9VM_RAS_DUMP_AGENTS
static UDATA
blankDumpSignalHandler(struct J9PortLibrary *portLibrary, U_32 gpType, void *gpInfo, void *arg)
{
J9VMThread *vmThread = (J9VMThread *) arg;
TR_VerboseLog::writeLineLocked(TR_Vlog_JITDUMP, "vmThread=%p Recursive crash occurred. Aborting JIT dump.", vmThread);

// Returning J9PORT_SIG_EXCEPTION_RETURN will make us come back to the same crashing instruction over and over
//
return J9PORT_SIG_EXCEPTION_RETURN; // FIXME: is this the right return type? - This appears to be the right return type
}
#endif

#if defined(J9VM_OPT_JITSERVER)
thread_local TR::CompilationInfoPerThread *TR::compInfoPT;
#endif /* defined(J9VM_OPT_JITSERVER) */
Expand Down
Loading

0 comments on commit 443422e

Please sign in to comment.