Implement size and permissions using libuv

justinj · justinj · commit 35ac3a67e676 · 2015-04-12T20:53:26.000+01:00
diff --git a/pixie/fs.pxi b/pixie/fs.pxi
@@ -1,19 +1,7 @@
 (ns pixie.fs
   (:require [pixie.path :as path]
             [pixie.string :as string]
-            [pixie.ffi-infer :as f]))
-
-(f/with-config {:library "c"
-                :cxx-flags ["-lc"]
-                :includes ["sys/stat.h"]}
-  (f/defc-raw-struct stat [:st_mode :st_size]))
-
-(def stat-struct stat)
-
-(f/with-config {:library "c"
-                :cxx-flags ["-lc"]
-                :includes ["sys/stat.h"]}
-  (f/defcfn stat))
+            [pixie.uv :as uv]))
 
 (defprotocol IFSPath
   (path [this]
@@ -96,16 +84,12 @@
 (defn- assert-existence [f]
     (assert (exists? f) (str "No file or directory at \"" (abs f) "\"")))
 
-(defn- read-stat-field [path field]
-  (assert-existence path)
-  (let [s (stat-struct)
-        _ (stat (abs path) s)
-        result (field s)]
-    (dispose! s)
-    result))
+(uv/defuvfsfn fs-size pixie.uv/uv_fs_stat [file] :statbuf.st_size)
+(uv/defuvfsfn fs-mode pixie.uv/uv_fs_stat [file] :statbuf.st_mode)
 
 (defn- size-of-path [path]
-  (read-stat-field path :st_size))
+  (assert-existence path)
+  (fs-size (abs path)))
 
 (defn- permission-string [n]
   (apply str
@@ -115,7 +99,8 @@
              (bit-shift-right masked shift)))))
 
 (defn- permissions-of-path [path]
-  (permission-string (read-stat-field path :st_mode)))
+  (assert-existence path)
+  (permission-string (fs-mode (abs path))))
 
 ;; File and Dir are just wrappers around paths.
 (deftype File [pathz]
diff --git a/pixie/io.pxi b/pixie/io.pxi
@@ -6,28 +6,10 @@
             [pixie.ffi :as ffi]
             [pixie.ffi-infer :as ffi-infer]))
 
-(defmacro defuvfsfn [nm args return]
-  `(defn ~nm ~args
-     (let [f (fn [k#]
-               (let [cb# (atom nil)]
-                 (reset! cb# (ffi/ffi-prep-callback uv/uv_fs_cb
-                                                (fn [req#]
-                                                  (try
-                                                    (st/run-and-process k# (~return (pixie.ffi/cast req# uv/uv_fs_t)))
-                                                    (uv/uv_fs_req_cleanup req#)
-                                                    (-dispose! @cb#)
-                                                    (catch e (println e))))))
-                 (~(symbol (str "pixie.uv/uv_" (name nm)))
-                  (uv/uv_default_loop)
-                  (uv/uv_fs_t)
-                  ~@args
-                  @cb#)))]
-       (st/call-cc f))))
-
-(defuvfsfn fs_open [path flags mode] :result)
-(defuvfsfn fs_read [file bufs nbufs offset] :result)
-(defuvfsfn fs_write [file bufs nbufs offset] :result)
-(defuvfsfn fs_close [file] :result)
+(uv/defuvfsfn fs_open [path flags mode] :result)
+(uv/defuvfsfn fs_read [file bufs nbufs offset] :result)
+(uv/defuvfsfn fs_write [file bufs nbufs offset] :result)
+(uv/defuvfsfn fs_close [file] :result)
 
 
 (def DEFAULT-BUFFER-SIZE 1024)
diff --git a/pixie/uv.pxi b/pixie/uv.pxi
@@ -1,5 +1,6 @@
 (ns pixie.uv
-  (:require [pixie.ffi-infer :as f]))
+  (:require [pixie.ffi :as ffi]
+            [pixie.ffi-infer :as f]))
 
 (f/with-config  {:library "uv"
                 :includes ["uv.h"]}
@@ -58,7 +59,9 @@
                          :fs_type
                          :path
                          :result
-                         :ptr])
+                         :ptr
+                         :statbuf.st_size
+                         :statbuf.st_mode])
   (f/defcstruct uv_timespec_t [:tv_sec
                                :tv_nsec])
   (f/defcstruct uv_stat_t [:st_dev
@@ -214,3 +217,24 @@
   (if (neg? result)
     (throw (str "UV Error: " (uv_err_name result)))
     result))
+
+(defmacro defuvfsfn
+  ([nm args return]
+   (defuvfsfn nm (symbol (str "pixie.uv/uv_" (name nm))) args return))
+  ([nm uv-fn args return]
+  `(defn ~nm ~args
+     (let [f (fn [k#]
+               (let [cb# (atom nil)]
+                 (reset! cb# (ffi/ffi-prep-callback uv_fs_cb
+                                                (fn [req#]
+                                                  (try
+                                                    (pixie.stacklets/run-and-process k# (~return (pixie.ffi/cast req# uv_fs_t)))
+                                                    (uv_fs_req_cleanup req#)
+                                                    (-dispose! @cb#)
+                                                    (catch e (println e))))))
+                 (~uv-fn
+                  (uv_default_loop)
+                  (uv_fs_t)
+                  ~@args
+                  @cb#)))]
+       (pixie.stacklets/call-cc f)))))
