compare perf to old version

Author: dsyme

paket.dependencies

@@ -5,5 +5,6 @@ nuget NUnit
 nuget NUnit.Runners
 nuget FAKE
 nuget SourceLink.Fake
+nuget FSharp.Control.AsyncSeq 1.15.0
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx

paket.lock

@@ -1,13 +1,14 @@
 NUGET
   remote: https://nuget.org/api/v2
   specs:
-    FAKE (3.26.1)
-    FSharp.Compiler.Service (0.0.86)
-    FSharp.Formatting (2.7.5)
-      FSharp.Compiler.Service (>= 0.0.82)
-      FSharpVSPowerTools.Core (>= 1.7.0)
-    FSharpVSPowerTools.Core (1.7.0)
-      FSharp.Compiler.Service (>= 0.0.81)
+    FAKE (3.31.4)
+    FSharp.Compiler.Service (0.0.89)
+    FSharp.Control.AsyncSeq (1.15.0)
+    FSharp.Formatting (2.9.6)
+      FSharp.Compiler.Service (>= 0.0.87)
+      FSharpVSPowerTools.Core (1.8.0)
+    FSharpVSPowerTools.Core (1.8.0)
+      FSharp.Compiler.Service (>= 0.0.87)
     Microsoft.Bcl (1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
     Microsoft.Bcl.Build (1.0.21)
@@ -16,11 +17,11 @@ NUGET
       Microsoft.Bcl.Build (>= 1.0.14)
     NUnit (2.6.4)
     NUnit.Runners (2.6.4)
-    Octokit (0.8.0)
+    Octokit (0.11.0)
       Microsoft.Net.Http
     SourceLink.Fake (0.5.0)
 GITHUB
   remote: fsharp/FAKE
   specs:
-    modules/Octokit/Octokit.fsx (60e49f7c915a8134a5f07ca408249e4bd7cc4a63)
+    modules/Octokit/Octokit.fsx (ac46f8ba9cc11bb6e8d02197720697c9e258c0d3)
       Octokit

src/FSharp.Control.AsyncSeq/AsyncSeq.fs

@@ -230,10 +230,9 @@ module AsyncSeq =
                                     | BindState.HaveEnumerator ->   
                                         let! res = enum.Value.MoveNext() 
                                         return (match res with
-                                                | None -> 
-                                                    x.Dispose()
-                                                    None
-                                                | Some _ -> res)
+                                                | None -> x.Dispose()
+                                                | Some _ -> ()
+                                                res)
                                     | _ -> 
                                         return None }
                         member x.Dispose() = 
@@ -282,12 +281,10 @@ module AsyncSeq =
   type TryWithState =
      | NotStarted    = -1
      | HaveBodyEnumerator = 0
-     | Finished = 1
-     | PreHandler = 2
-     | HaveHandlerEnumerator = 3
+     | HaveHandlerEnumerator = 1
+     | Finished = 2
 
   /// Implements the 'TryWith' functionality for computation builder
-  // this pushes the handler through all the async computations
   let tryWith (inp: AsyncSeq<'T>) (handler : exn -> AsyncSeq<'T>) : AsyncSeq<'T> = 
         { new IAsyncEnumerable<'T> with 
               member x.GetEnumerator() = 
@@ -311,7 +308,6 @@ module AsyncSeq =
                                         | Choice2Of2 exn -> 
                                             return! 
                                                (x.Dispose()
-                                                state := TryWithState.PreHandler
                                                 enum := (handler exn).GetEnumerator()
                                                 state := TryWithState.HaveHandlerEnumerator
                                                 x.MoveNext())
@@ -324,15 +320,15 @@ module AsyncSeq =
                                         with exn -> 
                                             res := Choice2Of2 exn
                                         match res.Value with 
-                                        | Choice1Of2 (Some res) -> 
-                                            return (Some res)
-                                        | Choice1Of2 None -> 
-                                            x.Dispose()
-                                            return None
+                                        | Choice1Of2 res -> 
+                                            return 
+                                                (match res with 
+                                                 | None -> x.Dispose()
+                                                 | _ -> ()
+                                                 res)
                                         | Choice2Of2 exn -> 
                                             return! 
                                               (x.Dispose()
-                                               state := TryWithState.PreHandler
                                                enum := (handler exn).GetEnumerator()
                                                state := TryWithState.HaveHandlerEnumerator
                                                x.MoveNext())

tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs

@@ -1,5 +1,9 @@
 #if INTERACTIVE
+#if COMPARE_TO_OLD
+#r @"../../packages/FSharp.Control.AsyncSeq/lib/net40/Fsharp.Control.AsyncSeq.dll"
+#else
 #r @"../../bin/FSharp.Control.AsyncSeq.dll"
+#endif
 #r @"../../packages/NUnit/lib/nunit.framework.dll"
 #time "on"
 #else
@@ -708,36 +712,38 @@ let ``asyncSeq.For should delay``() =
 
 
 
+
 let empty = async { return () }
 let perfTest1 n = 
     Seq.init n id
     |> AsyncSeq.ofSeq
     |> AsyncSeq.iterAsync (fun _ -> empty )
     |> Async.RunSynchronously
 
-// n                OLD     NEW
-//perfTest1 1000 - 0.244       0.001
-//perfTest1 2000 - 0.922
-//perfTest1 3000 - 2.091
-//perfTest1 4000 - 3.811
-//perfTest1 5000 - 6.311
-//perfTest1 6000 - 10.071      0.006
-//perfTest1 10000 - 38..0      0.012
-//perfTest1 100000 -           0.129
-//perfTest1 1000000 -          0.708
+// n                            NEW        1.15.0
+//perfTest1 1000 -             0.001        0.004
+//perfTest1 2000 - 
+//perfTest1 3000 - 
+//perfTest1 4000 - 
+//perfTest1 5000 - 
+//perfTest1 6000 -             0.006        0.020
+//perfTest1 10000 -            0.012
+//perfTest1 100000 -           0.129        0.260
+//perfTest1 1000000 -          0.708        2.345
+
 
 let perfTest2 n = 
     Seq.init n id
     |> AsyncSeq.ofSeq
     |> AsyncSeq.toArray
 
-// n                OLD     NEW
-//perfTest2 1000    0.227   0.038
-//perfTest2 2000    0.905   0.001
-//perfTest2 3000    2.154   0.004
-//perfTest2 4000    3.757
-//perfTest2 5000    6.197
-//perfTest2 10000   38.197  0.007
+// n                        NEW
+//perfTest2 1000            0.038
+//perfTest2 2000            0.001
+//perfTest2 3000            0.004
+//perfTest2 4000         
+//perfTest2 5000         
+//perfTest2 10000           0.007
 //perfTest2 100000          0.076
 //perfTest2 1000000         0.663
 
@@ -755,12 +761,29 @@ let perfTest3 n =
     |> AsyncSeq.toArray
 
 
-// n                OLD     NEW
+// n                        NEW         1.15.0
 //perfTest3 1000            0.003
 //perfTest3 2000            
 //perfTest3 3000            
 //perfTest3 4000         
 //perfTest3 5000           0.009
 //perfTest3 10000           0.015
 //perfTest3 100000          0.155
-//perfTest3 1000000         1.500
+//perfTest3 1000000         1.500      3.480
+
+let perfTest4 n = 
+    Seq.init n id
+    |> AsyncSeq.ofSeq 
+    |> AsyncSeq.map id
+    |> AsyncSeq.filter (fun x -> x % 2 = 0)
+    |> AsyncSeq.toArray
+
+// n                        NEW         1.15.0
+//perfTest4 1000                 
+//perfTest4 2000            
+//perfTest4 3000            
+//perfTest4 4000         
+//perfTest4 5000          
+//perfTest4 10000         
+//perfTest4 100000          0.362       0.442
+//perfTest4 1000000         3.533       4.656