commit cbfbe0bfbd01a02003575658b06c84696c712fc5
author Snehal <snehalreddy@google.com> Thu Mar 07 15:13:04 2024 +0000
committer Snehal Koukuntla <snehalreddy@google.com> Tue Mar 26 17:30:40 2024 +0000
tree 8b57aa2e67ecd771527f0a8268fa931473b3a814
parent a394dafc3db781f9aae94f9e30291d9466b94a17

[Kernel][Metrics] Simplify trusty crash metrics tipc message

Bug: 328592145

Change-Id: I17a0e844704f705e9786492c7c0ab7e36e883191

lib/metrics/metrics.c

diff --git a/lib/metrics/metrics.c b/lib/metrics/metrics.c
index 4939a0b..ac102b6 100644
--- a/lib/metrics/metrics.c
+++ b/lib/metrics/metrics.c
@@ -151,33 +151,15 @@
                         struct trusty_app* app,
                         uint32_t crash_reason) {
     int rc;
-    struct metrics_req req;
-    struct metrics_report_crash_req args;
-    char payload[METRICS_MAX_APP_ID_LEN];
-    size_t uuid_str_len;
-    size_t app_name_len;
-    size_t payload_len;
+    struct metrics_req req = {};
+    struct metrics_report_crash_req args = {};
     size_t total_len;
 
     DEBUG_ASSERT(is_mutex_held(&ctx_lock));
 
-    memset(payload, 0, METRICS_MAX_APP_ID_LEN);
-
-    /* Format of the payload is "<UUID>:<app name>". */
-    uuid_to_str(&app->props.uuid, payload);
-    uuid_str_len = strnlen(payload, UUID_STR_SIZE);
-    assert(uuid_str_len == UUID_STR_SIZE - 1);
-
-    /* Delimiter between UUID value and app name */
-    payload[uuid_str_len] = ':';
-
-    app_name_len = strnlen(app->props.app_name, APP_NAME_MAX_SIZE);
-    memcpy(&payload[UUID_STR_SIZE], app->props.app_name, app_name_len);
-    payload_len = UUID_STR_SIZE + app_name_len;
-    assert(payload_len <= METRICS_MAX_APP_ID_LEN);
+    uuid_to_str(&app->props.uuid, args.app_id);
 
     req.cmd = METRICS_CMD_REPORT_CRASH;
-    args.app_id_len = payload_len;
     args.crash_reason = crash_reason;
 
     struct iovec_kern iovs[] = {
@@ -189,17 +171,13 @@
                     .iov_base = &args,
                     .iov_len = sizeof(args),
             },
-            {
-                    .iov_base = payload,
-                    .iov_len = payload_len,
-            },
     };
     struct ipc_msg_kern ipc_msg = {
             .num_iov = countof(iovs),
             .iov = iovs,
     };
 
-    total_len = sizeof(req) + sizeof(args) + payload_len;
+    total_len = sizeof(req) + sizeof(args);
     rc = send_req(chan, &ipc_msg, total_len);
     if (rc != NO_ERROR) {
         TRACEF("failed (%d) report app crash\n", rc);