Merge pull request #7454 from mpirvu/JITServerChanges

Merge JITServer changes to CompilationThread.cpp/hpp
eclipse-openj9 · Oct 21, 2019 · 22cfe03 · 22cfe03
2 parents 11473a3 + ac10cd3
commit 22cfe03
Show file tree

Hide file tree

Showing 6 changed files with 1,656 additions and 1,085 deletions.
diff --git a/runtime/compiler/control/CompilationRuntime.hpp b/runtime/compiler/control/CompilationRuntime.hpp
@@ -77,8 +77,6 @@ template <typename T> class TR_PersistentArray;
 typedef J9JITExceptionTable TR_MethodMetaData;
 #if defined(JITSERVER_SUPPORT)
 class ClientSessionHT;
-
-namespace JITServer { class ServerStream; }
 #endif /* defined(JITSERVER_SUPPORT) */
 
 struct TR_SignatureCountPair
@@ -448,6 +446,8 @@ class CompilationInfo
    static void freeCompilationInfo(J9JITConfig *jitConfig);
    static TR::CompilationInfo *get(J9JITConfig * = 0) { return _compilationRuntime; }
    static bool shouldRetryCompilation(TR_MethodToBeCompiled *entry, TR::Compilation *comp);
+   static bool shouldAbortCompilation(TR_MethodToBeCompiled *entry, TR::PersistentInfo *persistentInfo);
+   static bool canRelocateMethod(TR::Compilation * comp);
    static bool useSeparateCompilationThread();
    static int computeCompilationThreadPriority(J9JavaVM *vm);
    static void *compilationEnd(J9VMThread *context, TR::IlGeneratorMethodDetails & details, J9JITConfig *jitConfig, void * startPC,
@@ -1015,8 +1015,6 @@ class CompilationInfo
    uint32_t getLocalGCCounter() const { return _localGCCounter; }
    void incrementLocalGCCounter() { _localGCCounter++; }
 
-   static bool canRelocateMethod(TR::Compilation * comp);
-
    const PersistentVector<std::string> &getJITServerSslKeys() const { return _sslKeys; }
    void  addJITServerSslKey(const std::string &key) { _sslKeys.push_back(key); }
    const PersistentVector<std::string> &getJITServerSslCerts() const { return _sslCerts; }