[GR-17457] Add --log-process-args and set various CLI commands in RbConfig to avoid extra ruby -run subprocesses

PullRequest: truffleruby/2852

Author: eregon

lib/cext/ABI_version.txt

@@ -1 +1 @@
-9
+10

lib/truffle/rbconfig.rb

@@ -55,6 +55,7 @@ module RbConfig
 
   arch = "#{host_cpu}-#{host_os}"
   libs = ''
+  rmdir = Truffle::Platform.linux? ? 'rmdir --ignore-fail-on-non-empty' : 'rmdir'
 
   prefix = ruby_home
   graalvm_home = TruffleRuby.graalvm_home
@@ -134,6 +135,7 @@ module RbConfig
     'configure_args'    => ' ',
     'CC'                => cc,
     'CCDLFLAGS'         => '-fPIC',
+    'CP'                => 'cp',
     'CXX'               => cxx,
     'COUTFLAG'          => '-o ',
     'cppflags'          => cppflags,
@@ -154,6 +156,7 @@ module RbConfig
     'host'              => host,
     'host_os'           => host_os_full,
     'includedir'        => "#{prefix}/lib/cext", # the parent dir of rubyhdrdir
+    'INSTALL'           => '/usr/bin/install -c',
     'LDFLAGS'           => ldflags,
     'libdirname'        => 'libdir',
     'LIBEXT'            => 'a',
@@ -167,6 +170,8 @@ module RbConfig
     'LIBRUBY_SO'        => "cext/libtruffleruby.#{Truffle::Platform::SOEXT}",
     'LIBS'              => libs,
     'libtruffleruby'    => libtruffleruby,
+    'MAKEDIRS'          => 'mkdir -p',
+    'MKDIR_P'           => 'mkdir -p',
     'NULLCMD'           => ':',
     'OBJEXT'            => 'o',
     'optflags'          => optflags,
@@ -175,6 +180,9 @@ module RbConfig
     'prefix'            => prefix,
     'RANLIB'            => ranlib,
     'RM'                => 'rm -f',
+    'RMALL'             => 'rm -fr',
+    'RMDIR'             => rmdir,
+    'RMDIRS'            => "#{rmdir} -p",
     'RPATHFLAG'         => ' -Wl,-rpath,%1$-s',
     'RUBY_BASE_NAME'    => ruby_base_name,
     'ruby_install_name' => ruby_install_name,

src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java

@@ -48,6 +48,9 @@ public class CommandLineOptions {
     boolean showVersion = false;
     boolean showCopyright = false;
     ShowHelp showHelp = ShowHelp.NONE;
+    /** All command-line arguments passed to truffleruby */
+    final String[] initialArguments;
+    boolean logProcessArguments = false;
     /** Read the RUBYOPT and TRUFFLERUBYOPT environment variables */
     boolean readRubyOptEnv = true;
     /** What should be done after context is created */
@@ -58,11 +61,13 @@ public class CommandLineOptions {
     String toExecute = "";
 
     private final Map<String, String> options;
+    /** Application arguments */
     private String[] arguments;
     private final List<String> unknownArguments;
     private Boolean gemOrBundle = null;
 
-    public CommandLineOptions() {
+    public CommandLineOptions(List<String> initialArguments) {
+        this.initialArguments = initialArguments.toArray(EMPTY_STRING_ARRAY);
         this.options = new HashMap<>();
         this.arguments = EMPTY_STRING_ARRAY;
         this.unknownArguments = new ArrayList<>();

src/launcher/java/org/truffleruby/launcher/CommandLineParser.java

@@ -425,6 +425,9 @@ private void processArgument() throws CommandLineException {
                         String feature = grabValue(getArgumentError("missing argument for " + argument), false);
                         config.getUnknownArguments().add(argument + "=" + feature);
                         break FOR;
+                    } else if (argument.equals("--log-process-args") || argument.equals("--log-process-args=true")) {
+                        config.logProcessArguments = true;
+                        break FOR;
                     } else if (argument.equals("--yydebug")) {
                         disallowedInRubyOpts(argument);
                         warnInternalDebugTool(argument);

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -74,7 +74,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
         // TruffleRuby is never distributed without the GraalVM compiler, so this warning is not necessary
         polyglotOptions.put("engine.WarnInterpreterOnly", "false");
 
-        config = new CommandLineOptions();
+        config = new CommandLineOptions(args);
 
         try {
             config.executionAction = ExecutionAction.UNSET;
@@ -249,6 +249,15 @@ private int runContext(Context.Builder builder, CommandLineOptions config) {
                 }
             }
 
+            if (config.logProcessArguments) {
+                Value logInfo = context.eval(
+                        "ruby",
+                        // language=ruby
+                        "-> message { Truffle::Debug.log_info(message) }");
+                String message = "new process: truffleruby " + String.join(" ", config.initialArguments);
+                logInfo.executeVoid(message);
+            }
+
             final Source source = Source.newBuilder(
                     TruffleRuby.LANGUAGE_ID,
                     // language=ruby

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

@@ -360,12 +360,12 @@ public abstract static class LogInfoNode extends CoreMethodArrayArgumentsNode {
         @Specialization
         protected Object logInfo(Object value,
                 @Cached ToJavaStringNode toJavaStringNode) {
-            config(toJavaStringNode.executeToJavaString(value));
+            info(toJavaStringNode.executeToJavaString(value));
             return nil;
         }
 
         @TruffleBoundary
-        static void config(String message) {
+        static void info(String message) {
             RubyLanguage.LOGGER.info(message);
         }