Upgrades with news NETStandard.Library 2.0.0-preview

Author: inmem

DuplicityKeys.Core.sample/Program.cs

@@ -2,12 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 
 namespace DuplicityKeys.Core.sample
 {
   class Program
   {
     //
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
     private struct BtnKey
     {
       public string keyCity;
@@ -45,20 +47,18 @@ static int CmpBtnKey(BtnKey keyX, BtnKey keyY, object objCmp)
       static bool FuncUpdate(BtnKey keyAdd, ref BtnKey keyUpdate, object objUpdate)
       {
         // Resize ?
-        if (keyUpdate.aValueDateTime.Length <= keyUpdate.valueCount)
+        if ((keyUpdate.aValueDateTime.Length <= keyUpdate.valueCount) || (keyUpdate.aValueRand.Length <= keyUpdate.valueCount))
         {
-          if (keyUpdate.aValueDateTime.Length >= 1024)
-            Array.Resize<DateTime>(ref keyUpdate.aValueDateTime, keyUpdate.aValueDateTime.Length + 256);
+          if ((keyUpdate.aValueDateTime.Length >= 1024) || (keyUpdate.aValueRand.Length >= 1024))
+          {
+            Array.Resize<DateTime>(ref keyUpdate.aValueDateTime, keyUpdate.aValueDateTime.Length + 1024);
+            Array.Resize<uint>(ref keyUpdate.aValueRand, keyUpdate.aValueRand.Length + 1024);
+          }
           else
+          {
             Array.Resize<DateTime>(ref keyUpdate.aValueDateTime, keyUpdate.aValueDateTime.Length * 2);
-        }
-        // Resize ?
-        if (keyUpdate.aValueRand.Length <= keyUpdate.valueCount)
-        {
-          if (keyUpdate.aValueRand.Length >= 1024)
-            Array.Resize<uint>(ref keyUpdate.aValueRand, keyUpdate.aValueRand.Length + 256);
-          else
             Array.Resize<uint>(ref keyUpdate.aValueRand, keyUpdate.aValueRand.Length * 2);
+          }
         }
         // Update
         keyUpdate.aValueDateTime[keyUpdate.valueCount] = keyAdd.aValueDateTime[0];
@@ -69,7 +69,7 @@ static bool FuncUpdate(BtnKey keyAdd, ref BtnKey keyUpdate, object objUpdate)
       //
       public static FcsKeyFastBTreeN<BtnKey> CreateFcsKeyFastBTreeN()
       {
-        return new FcsKeyFastBTreeN<BtnKey>(BtnKey.CmpBtnKey, BtnKey.FuncUpdate, 32);
+        return new FcsKeyFastBTreeN<BtnKey>(CmpBtnKey, FuncUpdate, 32);
       }
     }
     //
@@ -126,12 +126,17 @@ static void Main(string[] args)
       }
       swFcsKV.Stop();
       iMem = GC.GetTotalMemory(true);
-      Console.WriteLine("UsedMemory {0,5} MB [{1,5:N1} s] | {3} keys | Δ {2,3} MB | {4,8:N0} ns   | {5,10:N0} values", iMem >> 20, swFcsKV.Elapsed.TotalSeconds, (iMem - iMemOld) >> 20,
-                        btnTest.BtnUsedKeys(), ((double)(swFcsKV.Elapsed.TotalMilliseconds * 1000000) / iPocetAdd), iPocetAdd);
+      Console.WriteLine("UsedMemory {0,5} MB [{1,5:N1} s] | {3} keys | Δ {2,3} MB | {4,8:N0} ns   | {5,10:N0} values | sizeT {6,2} Byte", iMem >> 20, swFcsKV.Elapsed.TotalSeconds, (iMem - iMemOld) >> 20,
+                        btnTest.BtnUsedKeys(), ((double)(swFcsKV.Elapsed.TotalMilliseconds * 1000000) / iPocetAdd), iPocetAdd, Marshal.SizeOf<BtnKey>());
       iMemOld = iMem;
       int iCompareCount = 0;
+      // generate code at run time 
+      foreach (BtnKey? value in btnTest)
+        iCompareCount++;
+      // 
+      iCompareCount = 0;
       swFcsKV.Restart();
-      foreach(BtnKey? value in btnTest)
+      foreach (BtnKey? value in btnTest)
         iCompareCount++;
       swFcsKV.Stop();
       Console.WriteLine("\nFcsKeyFastBTreeN - foreach()");
@@ -140,12 +145,13 @@ static void Main(string[] args)
       iCompareCount = 0;
       FcsKeyFastBTreeN<BtnKey>.BtnKeyEnumeratorFast btnEn = btnTest.GetEnumeratorFastEx(false);
       swFcsKV.Restart();
-      while(btnEn.MoveNext())
+      while (btnEn.MoveNext())
       {
         BtnKey? value = btnEn.Current;
         iCompareCount++;
       }
       swFcsKV.Stop();
+      btnEn.Dispose();
       Console.WriteLine("\nFcsKeyFastBTreeN - foreach()");
       Console.WriteLine($"{((double)(swFcsKV.Elapsed.TotalMilliseconds * 1000000) / iCompareCount),9:N2} ns  [{swFcsKV.Elapsed.TotalMilliseconds,11} ms | {iCompareCount} keys ]{iCompareCount / swFcsKV.Elapsed.TotalSeconds,20:N0} IOPS");
 

FriendlyCSharp.Databases/BTreeN/FcsBTreeN.cs

@@ -385,7 +385,7 @@ public void BtnDeleteAll()
       BtnDeleteAll(false);
     }
     //////////////////////////
-    public void BtnDeleteAll(bool bRunGC)
+    public virtual void BtnDeleteAll(bool bRunGC)
     {
       lock (_btnLockAdd)
       {

FriendlyCSharp.Databases/BTreeN/FcsDuplValueFastBTreeN.cs

@@ -381,7 +381,7 @@ public void BtnDeleteAll()
       BtnDeleteAll(false);
     }
     //////////////////////////
-    public void BtnDeleteAll(bool bRunGC)
+    public virtual void BtnDeleteAll(bool bRunGC)
     {
       lock (_btnLockAdd)
       {
@@ -1506,7 +1506,7 @@ object IEnumerator.Current
         }
       }
       //////////////////////////
-      public void Dispose() { _btn = null; }
+      public void Dispose() { _btn = null; _btnFast.Dispose(); }
       //////////////////////////
       public void Reset()
       {

FriendlyCSharp.Databases/BTreeN/FcsFastBTreeN.cs

@@ -459,7 +459,7 @@ object IEnumerator.Current
         }
       }
       //////////////////////////
-      public void Dispose() { _btn = null; }
+      public void Dispose() { _btn = null; _btnFast.Dispose(); }
       //////////////////////////
       public void Reset()
       {

FriendlyCSharp.Databases/BTreeN/FcsKeyFastBTreeN.cs

@@ -352,7 +352,7 @@ public void BtnDeleteAll()
       BtnDeleteAll(false);
     }
     //////////////////////////
-    public void BtnDeleteAll(bool bRunGC)
+    public virtual void BtnDeleteAll(bool bRunGC)
     {
       lock (_btnLockAdd)
       {
@@ -1247,7 +1247,7 @@ object IEnumerator.Current
         }
       }
       //////////////////////////
-      public void Dispose() { _btn = null; }
+      public void Dispose() { _btn = null; _btnFast.Dispose(); }
       //////////////////////////
       public void Reset()
       {