Merge pull request #5 from samoht/fsevents

Fsevents
mirage · Aug 16, 2016 · d44917b · d44917b
2 parents 286d542 + 215a7cd
commit d44917b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+### 0.1.4
+
+- Use osx-fsevents > 0.2.0 to avoid an fd leak when starting/stoping
+  the main watch scheduler.
+
 ### 0.1.3
 
 - Fix `uname` runtime checks on Windows

diff --git a/opam b/opam
@@ -16,6 +16,7 @@ depends: [
   "lwt" "logs" "fmt" "astring"
 ]
 depopts: ["inotify" "osx-fsevents"]
+conflicts: [ "osx-fsevents" {< "0.2.0"} ]
 build: [
   "ocaml" "pkg/pkg.ml" "build" "--tests" "false"
     "--pinned" pinned

diff --git a/src/irmin_watcher_fsevents.ml b/src/irmin_watcher_fsevents.ml
@@ -32,7 +32,8 @@ let listen dir fn =
   let stop_scheduler () =
     (* Fsevents_lwt.flush watcher >>= fun () ->*)
     Fsevents_lwt.stop watcher;
-    Fsevents_lwt.invalidate watcher
+    Fsevents_lwt.invalidate watcher;
+    Fsevents_lwt.release watcher
   in
   fun () ->
     stop_iter ();