trace-load: improve lookup speeds and reduce cpu load caused

Signed-off-by: Alexander Mohr <[email protected]>
COVESA · Dec 16, 2024 · 013c3aa · 013c3aa
1 parent 96966fb
commit 013c3aa
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 102 deletions.
diff --git a/include/dlt/dlt_user.h.in b/include/dlt/dlt_user.h.in
@@ -180,6 +180,9 @@ typedef struct
     /* Log Level changed callback */
     void (*log_level_changed_callback)(char context_id[DLT_ID_SIZE], uint8_t log_level, uint8_t trace_status);
 
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+    DltTraceLoadSettings *trace_load_settings;    /**< trace load setting for the context */
+#endif
 } dlt_ll_ts_type;
 
 /**
@@ -1246,19 +1249,8 @@ DltReturnValue dlt_user_log_resend_buffer(void);
  * @param loglevel this is the current log level of the log message to be sent
  * @return Value from DltReturnValue enum, DLT_RETURN_TRUE if log level is enabled
  */
-static inline DltReturnValue dlt_user_is_logLevel_enabled(DltContext *handle, DltLogLevelType loglevel)
-{
-    if ((loglevel < DLT_LOG_DEFAULT) || (loglevel >= DLT_LOG_MAX))
-        return DLT_RETURN_WRONG_PARAMETER;
+inline DltReturnValue dlt_user_is_logLevel_enabled(DltContext *handle, DltLogLevelType loglevel);
 
-    if ((handle == NULL) || (handle->log_level_ptr == NULL))
-        return DLT_RETURN_WRONG_PARAMETER;
-
-    if ((loglevel <= (DltLogLevelType)(*(handle->log_level_ptr))) && (loglevel != DLT_LOG_OFF))
-        return DLT_RETURN_TRUE;
-
-    return DLT_RETURN_LOGGING_DISABLED;
-}
 
 #   ifdef DLT_TEST_ENABLE
 void dlt_user_test_corrupt_user_header(int enable);

diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
@@ -112,6 +112,7 @@ struct DltTraceLoadLogParams {
 };
 
 static DltReturnValue dlt_daemon_output_internal_msg(DltLogLevelType loglevel, const char *text, void *params);
+static void dlt_trace_load_free(DltDaemon* daemon);
 
 pthread_rwlock_t trace_load_rw_lock;
 #endif
@@ -1636,6 +1637,9 @@ int main(int argc, char *argv[])
     dlt_gateway_deinit(&daemon_local.pGateway, daemon_local.flags.vflag);
 
     dlt_daemon_free(&daemon, daemon_local.flags.vflag);
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+    dlt_trace_load_free(&daemon);
+#endif
 
     dlt_log(LOG_NOTICE, "Leaving DLT daemon\n");
 
@@ -1646,6 +1650,18 @@ int main(int argc, char *argv[])
 } /* main() */
 #endif
 
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+void dlt_trace_load_free(DltDaemon* daemon)
+{
+    if (daemon->preconfigured_trace_load_settings != NULL) {
+        free(daemon->preconfigured_trace_load_settings);
+        daemon->preconfigured_trace_load_settings = NULL;
+    }
+    pthread_rwlock_destroy(&trace_load_rw_lock);
+}
+#endif
+
+
 int dlt_daemon_local_init_p1(DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
 {
     PRINT_FUNCTION_VERBOSE(verbose);
@@ -3976,27 +3992,40 @@ bool trace_load_keep_message(DltDaemonApplication *app,
         app->apid,
     };
 
-    DltTraceLoadSettings *trace_load_settings =
-        dlt_find_runtime_trace_load_settings(
-            app->trace_load_settings, app->trace_load_settings_count,
-            app->apid, msg->extendedheader->ctid);
-
-    if (trace_load_settings != NULL) {
-        pthread_rwlock_wrlock(&trace_load_rw_lock);
-        keep_message = dlt_check_trace_load(
-            trace_load_settings, mtin, msg->headerextra.tmsp, size,
-            dlt_daemon_output_internal_msg, (void *)(&params));
-        pthread_rwlock_unlock(&trace_load_rw_lock);
-    }
-    else {
-        dlt_vlog(
-            LOG_ERR,
-            "Failed to lookup trace load limits for %s, "
-            "dropping message, likely app was not registered properly\n",
-            app->apid);
-        keep_message = false;
+    DltDaemonContext *context = dlt_daemon_context_find(
+        daemon,
+        app->apid,
+        msg->extendedheader->ctid,
+        daemon->ecuid,
+        verbose);
+
+
+    if (context == NULL) {
+        context = dlt_daemon_context_add(
+            daemon,
+            app->apid,
+            msg->extendedheader->ctid,
+            daemon->default_log_level,
+            daemon->default_trace_status,
+            0,
+            app->user_handle,
+            "",
+            daemon->ecuid,
+            verbose);
+        if (context == NULL) {
+            dlt_vlog(LOG_WARNING,
+                     "Can't add ContextID '%.4s' for ApID '%.4s' in %s\n",
+                     msg->extendedheader->ctid, app->apid, __func__);
+            return false;
+        }
     }
 
+    pthread_rwlock_wrlock(&trace_load_rw_lock);
+    keep_message = dlt_check_trace_load(
+        context->trace_load_settings, mtin, msg->headerextra.tmsp, size,
+        dlt_daemon_output_internal_msg, (void *)(&params));
+    pthread_rwlock_unlock(&trace_load_rw_lock);
+
     return keep_message;
 }
 #endif

diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
@@ -442,13 +442,6 @@ int dlt_daemon_free(DltDaemon *daemon, int verbose)
       free(daemon->app_id_log_level_settings);
     }
 #endif
-#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
-    if (daemon->preconfigured_trace_load_settings != NULL) {
-        free(daemon->preconfigured_trace_load_settings);
-        daemon->preconfigured_trace_load_settings = NULL;
-    }
-    pthread_rwlock_destroy(&trace_load_rw_lock);
-#endif
 
     if (app_recv_buffer)
         free(app_recv_buffer);
@@ -1134,6 +1127,10 @@ DltDaemonContext *dlt_daemon_context_add(DltDaemon *daemon,
         dlt_set_id(context->apid, apid);
         dlt_set_id(context->ctid, ctid);
 
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+        context->trace_load_settings = NULL;
+#endif
+
         application->num_contexts++;
         new_context = 1;
     }
@@ -1213,6 +1210,21 @@ DltDaemonContext *dlt_daemon_context_add(DltDaemon *daemon,
     context->log_level_pos = log_level_pos;
     context->user_handle = user_handle;
 
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+    DltTraceLoadSettings* tl_settings = dlt_find_runtime_trace_load_settings(
+        application->trace_load_settings,
+        application->trace_load_settings_count,
+        application->apid,
+        context->ctid);
+    if (tl_settings == NULL) {
+        dlt_vlog(LOG_WARNING, "failed to find trace load settings for application %s context %s\n",
+                 application->apid, context->ctid);
+    } else {
+        context->trace_load_settings = tl_settings;
+    }
+#endif
+
+
     /* In case a context is loaded from runtime config file,
      * the user_handle is 0 and we mark that context as predefined.
      */

diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h
@@ -162,7 +162,10 @@ typedef struct
     int user_handle;    /**< connection handle for connection to user application */
     char *context_description; /**< context description */
     int8_t storage_log_level; /**< log level set for offline logstorage */
-    bool predefined; /**< set to true if this context is predefined by runtime configuration file */
+    bool predefined;
+#ifdef DLT_TRACE_LOAD_CTRL_ENABLE
+    DltTraceLoadSettings* trace_load_settings;    /**< trace load setting for the context */
+#endif
 } DltDaemonContext;
 
 /*