Merge pull request #459 from bendlas/master

Improve tempdir usage in ffi-infer

Author: heyLu

pixie/ffi-infer.pxi

@@ -178,24 +178,35 @@ return 0;
   `(def ~(symbol name)
      ~(callback-type of-type false)))
 
+(def mkdtemp (ffi-fn libc "mkdtemp" [CCharP] CCharP))
+(def unlink (ffi-fn libc "unlink" [CCharP] CInt))
+(def rmdir (ffi-fn libc "rmdir" [CCharP] CInt))
+(def tempdir-template (str (or (getenv "TMPDIR") "/tmp")
+                           "/ffiXXXXXX"))
 
 (defn run-infer [config cmds]
-  (io/spit "/tmp/tmp.cpp" (str (start-string)
-                               (apply str (map emit-infer-code
-                                               cmds))
-                               (end-string)))
-  (println @load-paths)
-  (let [cmd-str (str "c++ "
-                     (apply str (interpose " " pixie.platform/c-flags))
-                     "  /tmp/tmp.cpp "
-                     (apply str (map (fn [x] ( str " -I " x " "))
-                                     @load-paths))
-                     (apply str " " (interpose " " (:cxx-flags *config*)))
-                     " -o /tmp/a.out && /tmp/a.out")
-        _ (println cmd-str)
-        result (read-string (io/run-command cmd-str))
-        gen (vec (map generate-code cmds result))]
-    `(do ~@gen)))
+  (let [tempdir (mkdtemp tempdir-template)
+        infile (str tempdir "/ffi.cpp")
+        outfile (str tempdir "/ffi.out")]
+    (io/spit infile (str (start-string)
+                         (apply str (map emit-infer-code
+                                         cmds))
+                         (end-string)))
+    (println @load-paths)
+    (let [cmd-str (str "c++ "
+                       (apply str (interpose " " pixie.platform/c-flags))
+                       " " infile " "
+                       (apply str (map (fn [x] ( str " -I " x " "))
+                                       @load-paths))
+                       (apply str " " (interpose " " (:cxx-flags *config*)))
+                       " -o " outfile " && " outfile)
+          _ (println cmd-str)
+          result (read-string (io/run-command cmd-str))
+          gen (vec (map generate-code cmds result))]
+      (unlink infile)
+      (unlink outfile)
+      (rmdir tempdir)
+      `(do ~@gen))))
 
 (defn full-lib-name [library-name]
   (if (= library-name "c")