Store server stream in compilation object for out-of-process compilations

Signed-off-by: Alexey Khrabrov <khrabrov@cs.toronto.edu>

Author: AlexeyKhrabrov

runtime/compiler/compile/J9Compilation.cpp

@@ -192,6 +192,7 @@ J9::Compilation::Compilation(int32_t id,
    _remoteCompilation(false),
    _serializedRuntimeAssumptions(getTypedAllocator<SerializedRuntimeAssumption *>(self()->allocator())),
    _clientData(NULL),
+   _stream(NULL),
    _globalMemory(*::trPersistentMemory, heapMemoryRegion),
    _perClientMemory(_trMemory),
    _methodsRequiringTrampolines(getTypedAllocator<TR_OpaqueMethodBlock *>(self()->allocator())),

runtime/compiler/compile/J9Compilation.hpp

@@ -327,21 +327,22 @@ class OMR_EXTENSIBLE Compilation : public OMR::CompilationConnector
 #if defined(J9VM_OPT_JITSERVER)
    static bool isOutOfProcessCompilation() { return _outOfProcessCompilation; } // server side
    static void setOutOfProcessCompilation() { _outOfProcessCompilation = true; }
+
    bool isRemoteCompilation() const { return _remoteCompilation; } // client side
    void setRemoteCompilation() { _remoteCompilation = true; }
-   TR::list<SerializedRuntimeAssumption*>& getSerializedRuntimeAssumptions() { return _serializedRuntimeAssumptions; }
+
+   TR::list<SerializedRuntimeAssumption *> &getSerializedRuntimeAssumptions() { return _serializedRuntimeAssumptions; }
+
    ClientSessionData *getClientData() const { return _clientData; }
    void setClientData(ClientSessionData *clientData) { _clientData = clientData; }
-   void switchToPerClientMemory()
-      {
-      _trMemory = _perClientMemory;
-      }
-   void switchToGlobalMemory()
-      {
-      _trMemory = &_globalMemory;
-      }
 
-   TR::list<TR_OpaqueMethodBlock *>& getMethodsRequiringTrampolines() { return _methodsRequiringTrampolines; }
+   JITServer::ServerStream *getStream() const { return _stream; }
+   void setStream(JITServer::ServerStream *stream) { _stream = stream; }
+
+   void switchToPerClientMemory() { _trMemory = _perClientMemory; }
+   void switchToGlobalMemory() { _trMemory = &_globalMemory; }
+
+   TR::list<TR_OpaqueMethodBlock *> &getMethodsRequiringTrampolines() { return _methodsRequiringTrampolines; }
 
    bool isAOTCacheStore() const { return _aotCacheStore; }
    void setAOTCacheStore(bool store) { _aotCacheStore = store; }
@@ -439,7 +440,7 @@ class OMR_EXTENSIBLE Compilation : public OMR::CompilationConnector
 #if defined(J9VM_OPT_JITSERVER)
    // This list contains assumptions created during the compilation at the JITServer
    // It needs to be sent to the client at the end of compilation
-   TR::list<SerializedRuntimeAssumption*> _serializedRuntimeAssumptions;
+   TR::list<SerializedRuntimeAssumption *> _serializedRuntimeAssumptions;
    // The following flag is set when this compilation is performed in a
    // VM that does not have the runtime part (server side in JITServer)
    static bool _outOfProcessCompilation;
@@ -449,6 +450,8 @@ class OMR_EXTENSIBLE Compilation : public OMR::CompilationConnector
    // Client session data for the client that requested this out-of-process
    // compilation (at the JITServer); unused (always NULL) at the client side
    ClientSessionData *_clientData;
+   // Server stream used by this out-of-process compilation; always NULL at the client
+   JITServer::ServerStream *_stream;
 
    TR_Memory *_perClientMemory;
    TR_Memory _globalMemory;

runtime/compiler/control/CompilationThread.cpp

@@ -1167,6 +1167,7 @@ TR::CompilationInfo::CompilationInfo(J9JITConfig *jitConfig) :
    _activationPolicy = JITServer::CompThreadActivationPolicy::AGGRESSIVE;
    _sharedROMClassCache = NULL;
    _JITServerAOTCacheMap = NULL;
+   _JITServerAOTDeserializer = NULL;
 #endif /* defined(J9VM_OPT_JITSERVER) */
    }
 
@@ -8567,6 +8568,7 @@ TR::CompilationInfoPerThreadBase::wrappedCompile(J9PortLibrary *portLib, void *
             // Create the KOT by default at the server as long as it is not disabled at the client.
             compiler->getOrCreateKnownObjectTable();
             compiler->setClientData(that->getClientData());
+            compiler->setStream(that->_methodBeingCompiled->_stream);
             }
 #endif /* defined(J9VM_OPT_JITSERVER) */