8365910: [BACKOUT] Add a compilation timeout flag to catch long running compilations

Reviewed-by: chagedorn, dholmes

Author: mhaessig

src/hotspot/os/linux/compilerThreadTimeout_linux.cpp

@@ -89,11 +89,6 @@
   product(bool, PrintMemoryMapAtExit, false, DIAGNOSTIC,                \
           "Print an annotated memory map at exit")                      \
                                                                         \
-  develop(intx, CompileTaskTimeout, 0,                                  \
-          "Set the timeout for compile tasks' CPU time in milliseconds."\
-          " 0 = no timeout (default)")                                  \
-          range(0,1000000)                                              \
-                                                                        \
 // end of RUNTIME_OS_FLAGS
 
 //

src/hotspot/os/linux/compilerThreadTimeout_linux.hpp

@@ -218,7 +218,6 @@ CompileTaskWrapper::CompileTaskWrapper(CompileTask* task) {
   CompilerThread* thread = CompilerThread::current();
   thread->set_task(task);
   CompileLog*     log  = thread->log();
-  thread->timeout()->arm();
   if (log != nullptr && !task->is_unloaded())  task->log_task_start(log);
 }
 
@@ -229,7 +228,6 @@ CompileTaskWrapper::~CompileTaskWrapper() {
   if (log != nullptr && !task->is_unloaded())  task->log_task_done(log);
   thread->set_task(nullptr);
   thread->set_env(nullptr);
-  thread->timeout()->disarm();
   if (task->is_blocking()) {
     bool free_task = false;
     {
@@ -1927,10 +1925,6 @@ void CompileBroker::compiler_thread_loop() {
     log->end_elem();
   }
 
-  if (!thread->init_compilation_timeout()) {
-    return;
-  }
-
   // If compiler thread/runtime initialization fails, exit the compiler thread
   if (!init_compiler_runtime()) {
     return;

src/hotspot/os/linux/globals_linux.hpp

@@ -40,7 +40,6 @@ CompilerThread::CompilerThread(CompileQueue* queue,
   _can_call_java = false;
   _compiler = nullptr;
   _arena_stat = nullptr;
-  _timeout = nullptr;
 
 #ifndef PRODUCT
   _ideal_graph_printer = nullptr;
@@ -50,7 +49,6 @@ CompilerThread::CompilerThread(CompileQueue* queue,
 CompilerThread::~CompilerThread() {
   // Delete objects which were allocated on heap.
   delete _counters;
-  delete _timeout;
   // arenastat should have been deleted at the end of the compilation
   assert(_arena_stat == nullptr, "Should be null");
 }

src/hotspot/share/compiler/compileBroker.cpp

@@ -25,14 +25,7 @@
 #ifndef SHARE_COMPILER_COMPILERTHREAD_HPP
 #define SHARE_COMPILER_COMPILERTHREAD_HPP
 
-#include "memory/allocation.hpp"
-#include "nmt/memTag.hpp"
 #include "runtime/javaThread.hpp"
-#include "utilities/macros.hpp"
-
-#ifdef LINUX
-#include "compilerThreadTimeout_linux.hpp"
-#endif //LINUX
 
 class AbstractCompiler;
 class ArenaStatCounter;
@@ -45,27 +38,10 @@ class CompileQueue;
 class CompilerCounters;
 class IdealGraphPrinter;
 
-#ifndef LINUX
-class CompilerThreadTimeoutGeneric : public CHeapObj<mtCompiler> {
- public:
-  CompilerThreadTimeoutGeneric() {};
-  void arm() {};
-  void disarm() {};
-  bool init_timeout() { return true; };
-};
-#endif // !LINUX
-
 // A thread used for Compilation.
 class CompilerThread : public JavaThread {
   friend class VMStructs;
   JVMCI_ONLY(friend class CompilerThreadCanCallJava;)
-
-#ifdef LINUX
-  typedef CompilerThreadTimeoutLinux Timeout;
-#else // LINUX
-  typedef CompilerThreadTimeoutGeneric Timeout;
-#endif // LINUX
-
  private:
   CompilerCounters* _counters;
 
@@ -81,7 +57,6 @@ class CompilerThread : public JavaThread {
 
   ArenaStatCounter*     _arena_stat;
 
-  Timeout*              _timeout;
  public:
 
   static CompilerThread* current() {
@@ -138,13 +113,7 @@ class CompilerThread : public JavaThread {
  public:
   IdealGraphPrinter *ideal_graph_printer()           { return _ideal_graph_printer; }
   void set_ideal_graph_printer(IdealGraphPrinter *n) { _ideal_graph_printer = n; }
-#endif // !PRODUCT
-
-  Timeout* timeout() const { return _timeout; };
-  bool init_compilation_timeout() {
-    _timeout = new Timeout();
-    return _timeout->init_timeout();
-  };
+#endif
 
   // Get/set the thread's current task
   CompileTask* task()                      { return _task; }

src/hotspot/share/compiler/compilerThread.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows" & os.family != "aix" & vm.flagless
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigalrm01.
  * VM testbase keywords: [signal, runtime, linux, macosx]