[REFACTOR] system info: rearrange struct fields

in the order they are present in the protocol.

Change-Id: Ia827fcea211da5b47107e1d4aab55a5b396d0bdc
Signed-off-by: Nikita Kalyazin <n.kalyazin@samsung.com>

diff --git a/daemon/da_protocol.h b/daemon/da_protocol.h
index 486093245eb03084e451b894c1e122ffed33ac1e..e9f655266107d01a1a1adcd0410d4bf71acb1d0f 100644 (file)
--- a/daemon/da_protocol.h
+++ b/daemon/da_protocol.h
@@ -268,23 +268,18 @@ struct process_info_t {
 };
 
 struct system_info_t {
-       uint32_t energy;
-       uint32_t wifi_status;
-       uint32_t bt_status;
-       uint32_t gps_status;
-       uint32_t brightness_status;
-       uint32_t camera_status;
-       uint32_t sound_status;
-       uint32_t audio_status;
-       uint32_t vibration_status;
-       uint32_t voltage_status;
-       uint32_t rssi_status;
-       uint32_t video_status;
-       uint32_t call_status;
-       uint32_t dnet_status;
-       float *cpu_frequency;
+       // system_cpu
        float app_cpu_usage;
+       float *cpu_frequency;
        float *cpu_load;
+       uint32_t count_of_threads;
+       struct thread_info_t *thread_load;
+
+       // system_processes
+       uint32_t count_of_processes;
+       struct process_info_t *process_load;
+
+       // system_memory
        uint32_t virtual_memory;
        uint32_t resident_memory;
        uint32_t shared_memory;
@@ -292,17 +287,35 @@ struct system_info_t {
        uint32_t total_alloc_size;
        uint64_t system_memory_total;
        uint64_t system_memory_used;
+
+       // system_disk
        uint32_t total_used_drive;
-       uint32_t count_of_threads;
-       struct thread_info_t *thread_load;
-       uint32_t count_of_processes;
-       struct process_info_t *process_load;
        uint32_t disk_reads;
        uint32_t disk_sectors_read;
        uint32_t disk_writes;
        uint32_t disk_sectors_write;
+
+       // system_network
        uint32_t network_send_size;
        uint32_t network_receive_size;
+
+       // system_device
+       uint32_t wifi_status;
+       uint32_t bt_status;
+       uint32_t gps_status;
+       uint32_t brightness_status;
+       uint32_t camera_status;
+       uint32_t sound_status;
+       uint32_t audio_status;
+       uint32_t vibration_status;
+       uint32_t voltage_status;
+       uint32_t rssi_status;
+       uint32_t video_status;
+       uint32_t call_status;
+       uint32_t dnet_status;
+
+       // system_energy
+       uint32_t energy;
        uint32_t energy_per_device[supported_devices_count];
        uint32_t app_energy_per_device[supported_devices_count];
 };