Reset counters on the static fields before testing

Author: fgarciacorona

csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs

@@ -43,6 +43,9 @@ public void FileDescriptor_CreateMessageWithDeepDependencies_BuildFromByteString
 
             // uncomment below to find how much slower it is without caching
             //FileDescriptor.DisableExtensionCaching();
+#if DEBUG
+            FileDescriptor.ResetCounters();
+#endif
 
             var stopwatchCached = Stopwatch.StartNew();
 
@@ -56,17 +59,17 @@ public void FileDescriptor_CreateMessageWithDeepDependencies_BuildFromByteString
 
 #if DEBUG
             // For performance reaons, benachmarking is only enabled in Debug builds
-            Assert.AreEqual(402, FileDescriptor.GetAllExtensionsCount);
-            Assert.AreEqual(573, FileDescriptor.GetAllGeneratedExtensionsCount);
-            Assert.AreEqual(399, FileDescriptor.GetAllDependedExtensionsCount);
-            Assert.AreEqual(39, FileDescriptor.GetAllDependedExtensionsFromMessageCount);
-            Assert.AreEqual(118, FileDescriptor.TotalReturnedExtensionsCount);
+            Assert.AreEqual(393, FileDescriptor.GetAllExtensionsCount);
+            Assert.AreEqual(394, FileDescriptor.GetAllGeneratedExtensionsCount);
+            Assert.AreEqual(392, FileDescriptor.GetAllDependedExtensionsCount);
+            Assert.AreEqual(0, FileDescriptor.GetAllDependedExtensionsFromMessageCount);
+            Assert.AreEqual(0, FileDescriptor.TotalReturnedExtensionsCount);
 #else
             Console.WriteLine("Benchmarking is only enabled for Debug build: Cannot verify expected method call and returned Extension count");
 #endif
 
             // actually test that the performance increase is significant
-            Assert.Less(stopwatchCached.Elapsed, TimeSpan.FromSeconds(2), "Extension performance was not as low as expected - please improve performance of extension resolution");
+            Assert.Less(stopwatchCached.Elapsed, TimeSpan.FromSeconds(1), "Extension performance was not as low as expected - please improve performance of extension resolution");
         }
 
         [Test]

csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs

@@ -72,14 +72,27 @@ static FileDescriptor()
         private static bool extensionCachingEnabled = true;
 
         /// <summary>
-        /// Enables caching of discovered extensions. Greatly improves performance at the tradeoff of memory usage.
+        /// Disables caching of discovered extensions. Greatly reduces performance in highly nested protos but lowers the memory usage.
         /// </summary>
         public static void DisableExtensionCaching()
         {
             extensionCachingEnabled = false;
         }
 
 #if WITH_BENCHMARKING
+
+        /// <summary>
+        /// Resets the benchmarking counters.
+        /// </summary>
+        public static void ResetCounters()
+        {
+            GetAllExtensionsCount = 0;
+            TotalReturnedExtensionsCount = 0;
+            GetAllGeneratedExtensionsCount = 0;
+            GetAllDependedExtensionsCount = 0;
+            GetAllDependedExtensionsFromMessageCount = 0;
+        }
+
         internal static long GetAllExtensionsCount { get; private set; }
         internal static long TotalReturnedExtensionsCount { get; private set;}
         internal static long GetAllGeneratedExtensionsCount { get; private set; }