Performance Stats - add to client

Author: leondavi

src_erl/NerlnetApp/src/Client/clientStatem.erl

@@ -75,7 +75,9 @@ init({MyName,NerlnetGraph, ClientWorkers , WorkerShaMap , WorkerToClientMap , Sh
   EtsRef = ets:new(client_data, [set, public]), %% client_data is responsible for functional attributes
   EtsStats = ets:new(ets_stats, [set]), %% ets_stats is responsible for holding all the ets stats (client + workers)
   ClientStatsEts = stats:generate_stats_ets(), %% client stats ets inside ets_stats
+  ClientPerformanceEts = stats:generate_performance_stats_ets(), %% client performance stats ets inside ets_stats
   ets:insert(EtsStats, {MyName, ClientStatsEts}),
+  ets:insert(EtsStats, {performance_stats, ClientStatsEts}),
   put(ets_stats, EtsStats),
   ets:insert(EtsRef, {workerToClient, WorkerToClientMap}), % All workers in the network (map to their client)
   ets:insert(EtsRef, {workersNames, ClientWorkers}), % All THIS Client's workers

src_erl/NerlnetApp/src/Stats/stats.erl

@@ -85,7 +85,7 @@ generate_stats_ets() -> %% sources, clients , routers , mainserver...
 %% Starts the os_mon application if it is not already started.
 %% This is necessary for monitoring system performance.
 %% It also ensures that the sasl application is started, as os_mon depends on it.
-start_os_mon() -> %% TODO check that it works
+start_os_mon() ->
     % check if os_mon is already started
     case application:which_applications() of
         [{os_mon, _, _} | _] ->
@@ -97,31 +97,30 @@ start_os_mon() -> %% TODO check that it works
     end,
     ok.
 
-generate_performance_stats_ets() -> %% sources, clients , routers , mainserver...
+generate_performance_stats_ets() -> %% clients
+    start_os_mon(),
     PerformanceStatsEts = ets:new(performance_stats_ets , [set, public]),
     ets:insert(PerformanceStatsEts, {average_time_training , 0}),
     ets:insert(PerformanceStatsEts, {average_time_prediction , 0}),
     ets:insert(PerformanceStatsEts, {average_cpu_all_cores_usage , 0}),
     ets:insert(PerformanceStatsEts, {average_cpu_all_cores_peak_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_0_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_1_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_2_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_3_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_4_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_5_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_6_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_7_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_8_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_9_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_10_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_11_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_12_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_13_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_14_usage , 0}),
-    ets:insert(PerformanceStatsEts, {average_cpu_core_15_usage , 0}),
     ets:insert(PerformanceStatsEts, {average_gpu_usage , 0}),
     ets:insert(PerformanceStatsEts, {average_gpu_memory_usage , 0}),
     ets:insert(PerformanceStatsEts, {average_memory_usage , 0}),
+    ets:insert(PerformanceStatsEts, {average_memory_peak_usage , 0}),
+
+    % cores usage
+    NumberOfCores = length(cpu_sup:util([per_cpu])),
+    ets:insert(PerformanceStatsEts, {num_of_cores , NumberOfCores}),
+    lists:foreach(fun(CoreIndex) ->
+        KeyAvgStr = lists:flatten(io_lib:format("average_cpu_core_~p_usage" , [CoreIndex])),
+        KeyAvgAtom = list_to_atom(KeyAvgStr),
+        ets:insert(PerformanceStatsEts, {KeyAvgAtom, 0}),
+        KeyPeakStr = lists:flatten(io_lib:format("peak_cpu_core_~p_usage" , [CoreIndex])),
+        KeyPeakAtom = list_to_atom(KeyPeakStr),
+        ets:insert(PerformanceStatsEts, {KeyPeakAtom, 0})
+    end, 
+    lists:seq(0, NumberOfCores)),
     PerformanceStatsEts.
 
 generate_workers_stats_ets() -> %% workers..