[GR-6145] File fastr_errors.log should live somewhere else.

PullRequest: fastr/1527

Author: steve-s

ci_common/common.hocon

@@ -25,7 +25,7 @@ java9Downloads : {
 }
 
 logfiles : [
-    "fastr_errors.log"
+    "fastr_errors*.log"
     "results.json"
     "libdownloads/R-*/gnur_configure.log"
     "libdownloads/R-*/config.log"

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RInternalError.java

@@ -45,7 +45,7 @@
  */
 public final class RInternalError extends Error implements TruffleException {
 
-    private static final String FASTR_ERRORS_LOG = "fastr_errors.log";
+    private static final String FASTR_ERRORS_LOG = "fastr_errors";
 
     private static final long serialVersionUID = 80698622974155216L;
 
@@ -194,7 +194,7 @@ private static void reportError(String errMsg, Throwable throwable, int contextI
 
                 String message = "An internal error occurred: \"" + errMsg + "\"\nPlease report an issue at https://github.com/oracle/fastr including the commands";
                 if (FastROptions.PrintErrorStacktracesToFile.getBooleanValue()) {
-                    message += " and the error log file '" + getLogFileName(contextId) + "'.";
+                    message += " and the error log file '" + Utils.getLogPath(getLogFileName(contextId)) + "'.";
                 } else {
                     message += ".";
                 }

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java

@@ -59,6 +59,7 @@
 import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
 import com.oracle.truffle.r.runtime.env.frame.FrameSlotChangeMonitor.MultiSlotData;
 import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
+import java.nio.file.Files;
 
 public final class Utils {
 
@@ -241,22 +242,41 @@ public static void updateCurwd(String path) {
     }
 
     /**
-     * Returns a {@link Path} for a log file with base name {@code fileName}, taking into account
-     * whether the system is running in embedded mode. In the latter case, we can't assume that the
-     * cwd is writable. Plus some embedded apps, e.g. RStudio, spawn multiple R sub-processes
-     * concurrently so we tag the file with the pid.
+     * Returns a {@link Path} for a log file with base name {@code fileNamePrefix}, adding '_pid'
+     * and process-id and '.log' and taking into account whether the system is running in embedded
+     * mode. In the latter case, we can't assume that the cwd is writable so '/tmp' is attempted.
+     * For regular mode dirs are attempted in this order: cwd, user's home, '/tmp', rHome. If none
+     * of the dirs is writable null is returned.
      */
-    public static Path getLogPath(String fileName) {
-        String root = RContext.isEmbedded() ? "/tmp" : REnvVars.rHome();
-        String baseName;
-        if (RContext.isEmbedded()) {
-            int pid = RContext.getInitialPid();
-            String threadName = Thread.currentThread().getName();
-            baseName = fileName + "-" + Integer.toString(pid) + "-" + threadName;
-        } else {
-            baseName = fileName;
+    public static Path getLogPath(String fileNamePrefix) {
+        String dir = RContext.isEmbedded() ? "/tmp" : System.getProperty("user.dir");
+        int dirId = 0;
+        int pid = RContext.getInitialPid();
+        String baseName = fileNamePrefix + "_pid" + Integer.toString(pid) + ".log";
+        while (true) {
+            Path path = FileSystems.getDefault().getPath(dir, baseName);
+            if (Files.isWritable(path.getParent())) {
+                return path;
+            }
+            switch (dirId) {
+                case 0:
+                    if (RContext.isEmbedded()) {
+                        return null;
+                    } else {
+                        dir = System.getProperty("user.home");
+                    }
+                    break;
+                case 1:
+                    dir = "/tmp";
+                    break;
+                case 2:
+                    dir = REnvVars.rHome();
+                    break;
+                default:
+                    return null;
+            }
+            dirId++;
         }
-        return FileSystems.getDefault().getPath(root, baseName);
     }
 
     /**

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFILog.java

@@ -46,7 +46,7 @@ public class RFFILog {
     /**
      * Always trace to a file because stdout is problematic for embedded mode.
      */
-    private static final String TRACEFILE = "fastr_trace_nativecalls.log";
+    private static final String TRACEFILE = "fastr_trace_nativecalls";
     private static PrintWriter traceStream;
 
     /**

mx.fastr/mx_fastr.py

@@ -485,8 +485,6 @@ def gnu_rtests(args, env=None):
     os.chdir(_fastr_suite.dir) # Packages install fails otherwise
  #   mx_fastr_pkgs.installpkgs(['--pkg-pattern', '^MASS$']) # required by tests/Examples/base-Ex.R
     np = mx.project('com.oracle.truffle.r.native')
-    ferrs = join(_fastr_suite.dir, 'fastr_errors.log')
-    ferrs_size = os.stat(ferrs).st_size if os.access(ferrs, os.R_OK) else 0
     tst = join(np.dir, 'gnur', 'tests')
     tstsrc = join(tst, 'src')
     tstlog = join(tst, 'log')
@@ -511,12 +509,6 @@ def gnu_rtests(args, env=None):
                         os.rename(outf, outff)
                         print 'Running {} explicitly by GnuR CMD BATCH ...'.format(f)
                         mx.run([join(_gnur_path(), 'R'), '--vanilla', 'CMD', 'BATCH', join(srcd, f)] + args, nonZeroIsFatal=False, env=env, timeout=90)
-                        ferrs_new_size = os.stat(ferrs).st_size if os.access(ferrs, os.R_OK) else 0
-                        if ferrs_new_size - ferrs_size > 0:
-                            with open(ferrs) as f:
-                                nlines = sum(1 for _ in f)
-                            print '  Size of {} increased to {:,} bytes ({:,} lines).\n'.format(ferrs, ferrs_new_size, nlines)
-                            ferrs_size = ferrs_new_size
                         if os.path.isfile(outf):
                             outfg = outf + '.gnur'
                             os.rename(outf, outfg)
@@ -525,7 +517,7 @@ def gnu_rtests(args, env=None):
                             subprocess.Popen([r_path(), 'CMD', 'Rdiff', outfg, outff], stdout=diff, stderr=diff, shell=False)
                             diff.flush()
         diff.close()
-        print 'FastR to GnuR diff was written to {}.'.format(diffname)
+        print 'FastR to GnuR diff was written to {}'.format(diffname)
     finally:
         shutil.rmtree(join(_fastr_suite.dir, 'deparse'), True)