From 83ee68ba8beda04343514d9e5905ea062cbeada0 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 21 Feb 2014 18:17:03 +0100
Subject: Future: make ~greedy:true the default + new sink commodity API

---
 lib/future.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/future.ml')

diff --git a/lib/future.ml b/lib/future.ml
index 8f2ae1df5a..5645352682 100644
--- a/lib/future.ml
+++ b/lib/future.ml
@@ -170,7 +170,7 @@ let transactify f x =
 let purify_future f x = if is_over x then f x else purify f x
 let compute x = purify_future (compute ~pure:false) x
 let force x = purify_future (force ~pure:false) x
-let chain ?(greedy=false) ~pure x f =
+let chain ?(greedy=true) ~pure x f =
   let y = chain ~pure x f in
   if is_over x && greedy then ignore(force y);
   y
@@ -180,6 +180,8 @@ let join kx =
   kx := Finished v;
   v
 
+let sink kx = if is_val kx then ignore(join kx)
+
 let split2 ?greedy x =
   chain ?greedy ~pure:true x (fun x -> fst x),
   chain ?greedy ~pure:true x (fun x -> snd x)
-- 
cgit v1.2.3