From d726c6e467bd6afc734d5c3dad649d3eb3886143 Mon Sep 17 00:00:00 2001
From: Igor <>
Date: Wed, 6 Feb 2019 15:05:50 +0300
Subject: [PATCH] Added java memory output

---
 UIPerformance/Activities/MainActivity.cs      | 12 +++++++---
 UIPerformance/Fragments/ContentFragment.cs    |  9 +++++++-
 UIPerformance/Models/ResultModel.cs           |  1 +
 .../Resources/layout/content_main.axml        | 22 +++++++++++++++----
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/UIPerformance/Activities/MainActivity.cs b/UIPerformance/Activities/MainActivity.cs
index 199ac6a..e6cb32b 100644
--- a/UIPerformance/Activities/MainActivity.cs
+++ b/UIPerformance/Activities/MainActivity.cs
@@ -29,10 +29,12 @@ public class MainActivity : AppCompatActivity, NavigationView.IOnNavigationItemS
         private TextView _linearTime;
         private TextView _linearSumTime;
         private TextView _linearMemory;
+        private TextView _linearJavaMemory;
         private TextView _relativeCount;
         private TextView _relativeTime;
         private TextView _relativeSumTime;
         private TextView _relativeMemory;
+        private TextView _relativeJavaMemory;
         private TextView _label;
         private Button _startButton;
 
@@ -60,10 +62,12 @@ protected override void OnCreate(Bundle savedInstanceState)
             _linearTime = FindViewById<TextView>(Resource.Id.linear_time);
             _linearSumTime = FindViewById<TextView>(Resource.Id.linear_sumtime);
             _linearMemory = FindViewById<TextView>(Resource.Id.linear_memory);
+            _linearJavaMemory = FindViewById<TextView>(Resource.Id.linear_java_memory);
             _relativeCount = FindViewById<TextView>(Resource.Id.relative_count);
             _relativeTime = FindViewById<TextView>(Resource.Id.relative_time);
             _relativeSumTime = FindViewById<TextView>(Resource.Id.relative_sumtime);
             _relativeMemory = FindViewById<TextView>(Resource.Id.relative_memory);
+            _relativeJavaMemory = FindViewById<TextView>(Resource.Id.relative_java_memory);
             _label = FindViewById<TextView>(Resource.Id.label);
 
             _startButton = FindViewById<Button>(Resource.Id.startButton);
@@ -194,6 +198,7 @@ void handler(ContentFragment sender)
                 fragment.ViewCreated -= handler;
                 model.ElapsedTime = sender.ElapsedTime;
                 model.ElapsedMemory = sender.ElapsedMemory;
+                model.ElapsedJavaMemory = sender.ElapsedJavaMemory;
                 UpdateResults(model);
             }
 
@@ -214,16 +219,16 @@ private void UpdateResults(ResultModel model)
             if(model.Type == ViewType.LinearLayout)
             {
                 _linearResults.Add(model);
-                UpdateUIResults(_linearCount, _linearTime, _linearSumTime, _linearMemory, _linearResults);
+                UpdateUIResults(_linearCount, _linearTime, _linearSumTime, _linearMemory, _linearJavaMemory, _linearResults);
             }
             else
             {
                 _relativeResults.Add(model);
-                UpdateUIResults(_relativeCount, _relativeTime, _relativeSumTime, _relativeMemory, _relativeResults);
+                UpdateUIResults(_relativeCount, _relativeTime, _relativeSumTime, _relativeMemory, _relativeJavaMemory, _relativeResults);
             }
         }
 
-        private void UpdateUIResults(TextView countTextView, TextView timeTextView, TextView sumtimeTextView, TextView memoryTextView, List<ResultModel> models)
+        private void UpdateUIResults(TextView countTextView, TextView timeTextView, TextView sumtimeTextView, TextView memoryTextView, TextView memoryJavaTextView, List<ResultModel> models)
         {
             RunOnUiThread(() =>
             {
@@ -231,6 +236,7 @@ private void UpdateUIResults(TextView countTextView, TextView timeTextView, Text
                 timeTextView.Text = models.Count > 0 ? models.Select(item => item.ElapsedTime).Average().ToString("0.0") : "0";
                 sumtimeTextView.Text = models.Count > 0 ? models.Select(item => item.ElapsedTime).Sum().ToString("0.0") : "0";
                 memoryTextView.Text = models.Count > 0 ? models.Select(item => item.ElapsedMemory).Average().ToString("0.000") : "0";
+                memoryJavaTextView.Text = models.Count > 0 ? models.Select(item => item.ElapsedJavaMemory).Average().ToString("0.000") : "0";
             });
         }
     }
diff --git a/UIPerformance/Fragments/ContentFragment.cs b/UIPerformance/Fragments/ContentFragment.cs
index 42460b7..787ccd1 100644
--- a/UIPerformance/Fragments/ContentFragment.cs
+++ b/UIPerformance/Fragments/ContentFragment.cs
@@ -2,6 +2,7 @@
 using Android.OS;
 using Android.Support.V4.App;
 using Android.Views;
+using Java.Lang;
 
 namespace UIPerformance.Fragments
 {
@@ -12,6 +13,7 @@ public class ContentFragment : Fragment
 
         public int ElapsedTime { get; private set; }
         public decimal ElapsedMemory { get; private set; }
+        public decimal ElapsedJavaMemory { get; private set; }
 
         public event ViewCreatedEventHandler ViewCreated;
 
@@ -22,9 +24,14 @@ public ContentFragment(int resource)
 
         public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
         {
+            Runtime runtime = Runtime.GetRuntime();
+            Console.WriteLine("Total - " + runtime.TotalMemory());
+            Console.WriteLine("Free - " + runtime.FreeMemory());
+            Console.WriteLine("Max - " + runtime.MaxMemory());
             var timeStart = DateTime.UtcNow;
             var view = inflater.Inflate(_resource, container, false);
-            ElapsedMemory =  GC.GetTotalMemory(true) / (1024 * 1024);
+            ElapsedMemory =  GC.GetTotalMemory(true);
+            ElapsedJavaMemory = (runtime.TotalMemory() - runtime.FreeMemory());
             ElapsedTime = (DateTime.UtcNow - timeStart).Milliseconds;
             ViewCreated?.Invoke(this);
             return view;
diff --git a/UIPerformance/Models/ResultModel.cs b/UIPerformance/Models/ResultModel.cs
index 542c031..a5b0a66 100644
--- a/UIPerformance/Models/ResultModel.cs
+++ b/UIPerformance/Models/ResultModel.cs
@@ -5,5 +5,6 @@ public class ResultModel
         public ViewType Type { get; set; }
         public int ElapsedTime { get; set; }
         public decimal ElapsedMemory { get; set; }
+        public decimal ElapsedJavaMemory { get; set; }
     }
 }
diff --git a/UIPerformance/Resources/layout/content_main.axml b/UIPerformance/Resources/layout/content_main.axml
index c43099e..f8a873b 100644
--- a/UIPerformance/Resources/layout/content_main.axml
+++ b/UIPerformance/Resources/layout/content_main.axml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:weightSum="4"
+            android:weightSum="4.6"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="2dp">
             <TextView
@@ -41,14 +41,18 @@
                 android:layout_weight="0.7" />
             <TextView
                 style="@style/baseText"
-                android:text="Memory"
+                android:text=".Net Memory"
+                android:layout_weight="0.6" />
+            <TextView
+                style="@style/baseText"
+                android:text="Java Memory"
                 android:layout_weight="0.6" />
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:weightSum="4"
+            android:weightSum="4.6"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="2dp">
             <TextView
@@ -75,12 +79,17 @@
                 android:text="0"
                 android:layout_weight="0.6"
                 android:id="@+id/linear_memory" />
+            <TextView
+                style="@style/baseText"
+                android:text="0"
+                android:layout_weight="0.6"
+                android:id="@+id/linear_java_memory" />
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:weightSum="4"
+            android:weightSum="4.6"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="2dp">
             <TextView
@@ -107,6 +116,11 @@
                 android:text="0"
                 android:layout_weight="0.6"
                 android:id="@+id/relative_memory" />
+            <TextView
+                style="@style/baseText"
+                android:text="0"
+                android:layout_weight="0.6"
+                android:id="@+id/relative_java_memory" />
         </LinearLayout>
     </LinearLayout>
     <Button