2 files changed, 52 insertions, 31 deletions

diff --git a/bench/Throughtput.hs b/bench/Throughtput.hs
new file mode 100644
index 00000000..d0404405
--- /dev/null
+++ b/bench/Throughtput.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE ViewPatterns  #-}
+{-# LANGUAGE PatternGuards #-}
+module Main (main) where
+
+import Control.Concurrent
+import Data.Bitfield
+import Network.BitTorrent
+import System.Environment
+import Control.Monad.Reader
+import Data.IORef
+
+
+main :: IO ()
+main = do
+  [path]  <- getArgs
+  torrent <- fromFile path
+
+  print (contentLayout "./" (tInfo torrent))
+
+  client  <- newClient 100 []
+  swarm   <- newLeecher  client torrent
+
+  ref <- liftIO $ newIORef 0
+  discover swarm $ do
+    forever $ do
+      e <- awaitEvent
+      case e of
+        Available bf
+          | Just m <- findMin bf -> yieldEvent (Want (BlockIx m 0 10))
+          |     otherwise        -> return ()
+        Want     bix -> liftIO $ print bix
+        Fragment blk -> do
+
+          sc <- liftIO $ getSessionCount swarm
+          addr <- asks connectedPeerAddr
+
+          liftIO $ do
+            x <- atomicModifyIORef ref (\x -> (succ x, x))
+            if x `mod` 100 == 0
+              then print (x, sc, addr)
+              else return ()
+
+          yieldEvent (Want (BlockIx 0 0 (16 * 1024)))
+
+
+  print "Bye-bye! =_="
\ No newline at end of file
diff --git a/examples/Main.hs b/examples/Main.hs
index fdf982d8..9786dbdc 100644
--- a/examples/Main.hs
+++ b/examples/Main.hs
@@ -1,13 +1,9 @@
-{-# LANGUAGE ViewPatterns  #-}
-{-# LANGUAGE PatternGuards #-}
 module Main (main) where
 
-import Control.Concurrent
-import Data.Bitfield
+import Control.Monad
 import Network.BitTorrent
 import System.Environment
-import Control.Monad.Reader
-import Data.IORef
+import Control.Monad.Trans
 
 
 main :: IO ()
@@ -20,30 +16,9 @@ main = do
   client  <- newClient 100 []
   swarm   <- newLeecher  client torrent
 
---  storage <- bindStorage swarm "/tmp/"
---  discover swarm $ exchange storage
+  storage <- swarm `bindTo`  "/tmp/"
 
-  ref <- liftIO $ newIORef 0
   discover swarm $ do
-    forever $ do
-      e <- awaitEvent
-      case e of
-        Available bf
-          | Just m <- findMin bf -> yieldEvent (Want (BlockIx m 0 10))
-          |     otherwise        -> return ()
-        Want     bix -> liftIO $ print bix
-        Fragment blk -> do
-
-          sc <- liftIO $ getSessionCount swarm
-          addr <- asks connectedPeerAddr
-
-          liftIO $ do
-            x <- atomicModifyIORef ref (\x -> (succ x, x))
-            if x `mod` 100 == 0
-              then print (x, sc, addr)
-              else return ()
-
-          yieldEvent (Want (BlockIx 0 0 (16 * 1024)))
-
-
-  print "Bye-bye! =_="
\ No newline at end of file
+    liftIO $ print "connected to peer"
+    forever $ exchange storage
+    liftIO $ print "disconnect to peer"
\ No newline at end of file