Merge pull request #46 from jpeach/use-tmp-preproc

Use a local tempfile for preprocessed output.
nelhage · Jun 19, 2021 · bba176b · bba176b
2 parents 28e5289 + 5730e57
commit bba176b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/cmd/llamacc/args.go b/cmd/llamacc/args.go
@@ -89,6 +89,17 @@ func (c *Compilation) RemoteCompiler(cfg *Config) string {
 	return "cc"
 }
 
+// LanguageExt returns the file extension for the current language.
+func (c *Compilation) LanguageExt() string {
+	for k, v := range extLangs {
+		if v == c.Language {
+			return k
+		}
+	}
+
+	panic("unknown language extension")
+}
+
 type Flags struct {
 	MD  bool
 	MMD bool

diff --git a/cmd/llamacc/main.go b/cmd/llamacc/main.go
@@ -188,6 +188,16 @@ func buildLocalPreprocess(ctx context.Context, client *daemon.Client, cfg *Confi
 		return fmt.Errorf("find %s: %w", comp.LocalCompiler(cfg), err)
 	}
 
+	tmp, err := ioutil.TempFile("", fmt.Sprintf("llamacc-*%s", comp.LanguageExt()))
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		os.Remove(tmp.Name())
+		tmp.Close()
+	}()
+
 	var preprocessed bytes.Buffer
 	{
 		var preprocessor exec.Cmd
@@ -197,8 +207,9 @@ func buildLocalPreprocess(ctx context.Context, client *daemon.Client, cfg *Confi
 		preprocessor.Args = append(preprocessor.Args, comp.LocalArgs...)
 		if !cfg.FullPreprocess {
 			preprocessor.Args = append(preprocessor.Args, "-fdirectives-only")
+
 		}
-		preprocessor.Args = append(preprocessor.Args, "-E", "-o", "-", comp.Input)
+		preprocessor.Args = append(preprocessor.Args, "-E", "-o", tmp.Name(), comp.Input)
 		preprocessor.Stdout = &preprocessed
 		preprocessor.Stderr = os.Stderr
 		if cfg.Verbose {
@@ -212,6 +223,9 @@ func buildLocalPreprocess(ctx context.Context, client *daemon.Client, cfg *Confi
 
 	args := daemon.InvokeWithFilesArgs{
 		Function: cfg.Function,
+		Files: []files.Mapped{
+			remap(tmp.Name(), wd),
+		},
 		Outputs: []files.Mapped{
 			{
 				Local:  files.LocalFile{Path: path.Join(wd, comp.Output)},
@@ -226,7 +240,7 @@ func buildLocalPreprocess(ctx context.Context, client *daemon.Client, cfg *Confi
 	if !cfg.FullPreprocess {
 		args.Args = append(args.Args, "-fdirectives-only", "-fpreprocessed")
 	}
-	args.Args = append(args.Args, "-x", comp.PreprocessedLanguage, "-o", comp.Output, "-")
+	args.Args = append(args.Args, "-x", comp.PreprocessedLanguage, "-o", comp.Output, toRemote(tmp.Name(), wd))
 
 	out, err := client.InvokeWithFiles(&args)
 	if err != nil {