[diag] add diag output callback

The length of diag output messages is limited by the diag buffer size. Developers have to change the diag buffer size to allow diag module to output long messages. If diag output messages become longer and longer, developers have to keep changing the diag buffer size. This commit adds an output callback to diag module to output diag messages. Then the length of diag output messages won't be limited by the diag buffer size.
zhanglongxia · Jun 14, 2024 · 775d82b · 775d82b
1 parent 6bc3b4d
commit 775d82b
Show file tree

Hide file tree

Showing 21 changed files with 501 additions and 265 deletions.
diff --git a/examples/platforms/simulation/diag.c b/examples/platforms/simulation/diag.c
@@ -58,6 +58,13 @@ static bool       sGpioValue = false;
 static uint8_t    sRawPowerSetting[OPENTHREAD_CONFIG_POWER_CALIBRATION_RAW_POWER_SETTING_SIZE];
 static uint16_t   sRawPowerSettingLength = 0;
 
+void otPlatDiagSetOutputCallback(otInstance *aInstance, otPlatDiagOutputCallback aCallback, void *aContext)
+{
+    OT_UNUSED_VARIABLE(aInstance);
+    OT_UNUSED_VARIABLE(aCallback);
+    OT_UNUSED_VARIABLE(aContext);
+}
+
 void otPlatDiagModeSet(bool aMode) { sDiagMode = aMode; }
 
 bool otPlatDiagModeGet(void) { return sDiagMode; }

diff --git a/include/openthread/diag.h b/include/openthread/diag.h
@@ -36,6 +36,7 @@
 #define OPENTHREAD_DIAG_H_
 
 #include <openthread/instance.h>
+#include <openthread/platform/diag.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,47 +52,46 @@ extern "C" {
  *
  */
 
+/* Represents the pointer to callback to output diag messages. */
+typedef otPlatDiagOutputCallback otDiagOutputCallback;
+
 /**
- * Processes a factory diagnostics command line.
+ * Sets the diag output callback.
  *
- * The output of this function (the content written to @p aOutput) MUST terminate with `\0` and the `\0` is within the
- * output buffer.
+ * @param[in]  aInstance   The OpenThread instance structure.
+ * @param[in]  aCallback   A pointer to a function that is called on outputting diag messages.
+ * @param[in]  aContext    A pointer to the user context.
+ *
+ */
+void otDiagSetOutputCallback(otInstance *aInstance, otDiagOutputCallback aCallback, void *aContext);
+
+/**
+ * Processes a factory diagnostics command line.
  *
  * @param[in]   aInstance       A pointer to an OpenThread instance.
  * @param[in]   aArgsLength     The number of elements in @p aArgs.
  * @param[in]   aArgs           An array of arguments.
- * @param[out]  aOutput         The diagnostics execution result.
- * @param[in]   aOutputMaxLen   The output buffer size.
  *
  * @retval  OT_ERROR_INVALID_ARGS       The command is supported but invalid arguments provided.
  * @retval  OT_ERROR_NONE               The command is successfully process.
  * @retval  OT_ERROR_NOT_IMPLEMENTED    The command is not supported.
  *
  */
-otError otDiagProcessCmd(otInstance *aInstance,
-                         uint8_t     aArgsLength,
-                         char       *aArgs[],
-                         char       *aOutput,
-                         size_t      aOutputMaxLen);
+otError otDiagProcessCmd(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
 
 /**
  * Processes a factory diagnostics command line.
  *
- * The output of this function (the content written to @p aOutput) MUST terminate with `\0` and the `\0` is within the
- * output buffer.
- *
  * @param[in]   aInstance       A pointer to an OpenThread instance.
  * @param[in]   aString         A NULL-terminated input string.
- * @param[out]  aOutput         The diagnostics execution result.
- * @param[in]   aOutputMaxLen   The output buffer size.
  *
  * @retval  OT_ERROR_NONE               The command is successfully process.
  * @retval  OT_ERROR_INVALID_ARGS       The command is supported but invalid arguments provided.
  * @retval  OT_ERROR_NOT_IMPLEMENTED    The command is not supported.
  * @retval  OT_ERROR_NO_BUFS            The command string is too long.
  *
  */
-otError otDiagProcessCmdLine(otInstance *aInstance, const char *aString, char *aOutput, size_t aOutputMaxLen);
+otError otDiagProcessCmdLine(otInstance *aInstance, const char *aString);
 
 /**
  * Indicates whether or not the factory diagnostics mode is enabled.

diff --git a/include/openthread/instance.h b/include/openthread/instance.h
@@ -53,7 +53,7 @@ extern "C" {
  * @note This number versions both OpenThread platform and user APIs.
  *
  */
-#define OPENTHREAD_API_VERSION (420)
+#define OPENTHREAD_API_VERSION (421)
 
 /**
  * @addtogroup api-instance

diff --git a/include/openthread/platform/diag.h b/include/openthread/platform/diag.h
@@ -67,27 +67,38 @@ typedef enum
 } otGpioMode;
 
 /**
- * Processes a factory diagnostics command line.
+ * Pointer to callback to output platform diag messages.
+ *
+ * @param[in]  aFormat     The format string.
+ * @param[in]  aArguments  The format string arguments.
+ * @param[out] aContext    A pointer to the user context.
+ *
+ */
+typedef void (*otPlatDiagOutputCallback)(const char *aFormat, va_list aArguments, void *aContext);
+
+/**
+ * Sets the platform diag output callback.
  *
- * The output of this function (the content written to @p aOutput) MUST terminate with `\0` and the `\0` is within the
- * output buffer.
+ * @param[in]  aInstance   The OpenThread instance structure.
+ * @param[in]  aCallback   A pointer to a function that is called on outputting diag messages.
+ * @param[in]  aContext    A pointer to the user context.
+ *
+ */
+void otPlatDiagSetOutputCallback(otInstance *aInstance, otPlatDiagOutputCallback aCallback, void *aContext);
+
+/**
+ * Processes a factory diagnostics command line.
  *
  * @param[in]   aInstance       The OpenThread instance for current request.
  * @param[in]   aArgsLength     The number of arguments in @p aArgs.
  * @param[in]   aArgs           The arguments of diagnostics command line.
- * @param[out]  aOutput         The diagnostics execution result.
- * @param[in]   aOutputMaxLen   The output buffer size.
  *
  * @retval  OT_ERROR_INVALID_ARGS       The command is supported but invalid arguments provided.
  * @retval  OT_ERROR_NONE               The command is successfully process.
  * @retval  OT_ERROR_INVALID_COMMAND    The command is not valid or not supported.
  *
  */
-otError otPlatDiagProcess(otInstance *aInstance,
-                          uint8_t     aArgsLength,
-                          char       *aArgs[],
-                          char       *aOutput,
-                          size_t      aOutputMaxLen);
+otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
 
 /**
  * Enables/disables the factory diagnostics mode.

diff --git a/script/check-size b/script/check-size
@@ -105,9 +105,11 @@ build_nrf52840()
     case "$2" in
         new)
             local sha=${OT_SHA_NEW}
+            local clone_options="clone"
             ;;
         old)
             local sha=${OT_SHA_OLD}
+            local clone_options="clone no-depend"
             ;;
         *)
             exit 128
@@ -119,7 +121,7 @@ build_nrf52840()
     local config_file="../examples/config/${config_name}"
 
     mkdir -p "${OT_TMP_DIR}/${folder}"
-    script/git-tool clone https://github.com/openthread/ot-nrf528xx.git "${OT_TMP_DIR}/${folder}"
+    script/git-tool "${clone_options}" https://github.com/openthread/ot-nrf528xx.git "${OT_TMP_DIR}/${folder}"
     rm -rf "${OT_TMP_DIR}/${folder}/openthread/*" # replace openthread submodule with latest commit
     git archive "${sha}" | tar x -C "${OT_TMP_DIR}/${folder}/openthread"
 

diff --git a/script/git-tool b/script/git-tool
@@ -80,10 +80,15 @@ try_clone()
 {
     local dest_dir
 
-    dest_dir="$(git clone "$@" 2>&1 | tee | cut -d\' -f2)"
-
-    cd "${dest_dir}"
-    get_pr_body | apply_dependencies
+    if [[ $1 == no-depend ]]; then
+        shift
+        git clone "$@" 2>&1
+    else
+        dest_dir="$(git clone "$@" 2>&1 | tee | cut -d\' -f2)"
+
+        cd "${dest_dir}"
+        get_pr_body | apply_dependencies
+    fi
 }
 
 print_help()

diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
@@ -169,6 +169,10 @@ Interpreter::Interpreter(Instance *aInstance, otCliOutputCallback aCallback, voi
 #if (OPENTHREAD_FTD || OPENTHREAD_MTD) && OPENTHREAD_CONFIG_CLI_REGISTER_IP6_RECV_CALLBACK
     otIp6SetReceiveCallback(GetInstancePtr(), &Interpreter::HandleIp6Receive, this);
 #endif
+#if OPENTHREAD_CONFIG_DIAG_ENABLE
+    otDiagSetOutputCallback(GetInstancePtr(), &Interpreter::HandleDiagOutput, this);
+#endif
+
     ClearAllBytes(mUserCommands);
 
     OutputPrompt();
@@ -210,19 +214,20 @@ void Interpreter::OutputResult(otError aError)
 #if OPENTHREAD_CONFIG_DIAG_ENABLE
 template <> otError Interpreter::Process<Cmd("diag")>(Arg aArgs[])
 {
-    otError error;
-    char   *args[kMaxArgs];
-    char    output[OPENTHREAD_CONFIG_DIAG_OUTPUT_BUFFER_SIZE];
+    char *args[kMaxArgs];
 
     // all diagnostics related features are processed within diagnostics module
     Arg::CopyArgsToStringArray(aArgs, args);
 
-    error = otDiagProcessCmd(GetInstancePtr(), Arg::GetArgsLength(aArgs), args, output, sizeof(output));
-
-    OutputFormat("%s", output);
+    return otDiagProcessCmd(GetInstancePtr(), Arg::GetArgsLength(aArgs), args);
+}
 
-    return error;
+void Interpreter::HandleDiagOutput(const char *aFormat, va_list aArguments, void *aContext)
+{
+    static_cast<Interpreter *>(aContext)->HandleDiagOutput(aFormat, aArguments);
 }
+
+void Interpreter::HandleDiagOutput(const char *aFormat, va_list aArguments) { OutputFormatV(aFormat, aArguments); }
 #endif
 
 template <> otError Interpreter::Process<Cmd("version")>(Arg aArgs[])

diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp
@@ -339,6 +339,11 @@ class Interpreter : public OutputImplementer, public Utils
 
 #endif // OPENTHREAD_FTD || OPENTHREAD_MTD
 
+#if OPENTHREAD_CONFIG_DIAG_ENABLE
+    static void HandleDiagOutput(const char *aFormat, va_list aArguments, void *aContext);
+    void        HandleDiagOutput(const char *aFormat, va_list aArguments);
+#endif
+
     void SetCommandTimeout(uint32_t aTimeoutMilli);
 
     static void HandleTimer(Timer &aTimer);

diff --git a/src/core/api/diags_api.cpp b/src/core/api/diags_api.cpp
@@ -42,18 +42,22 @@
 
 using namespace ot;
 
-otError otDiagProcessCmdLine(otInstance *aInstance, const char *aString, char *aOutput, size_t aOutputMaxLen)
+otError otDiagProcessCmdLine(otInstance *aInstance, const char *aString)
 {
     AssertPointerIsNotNull(aString);
 
-    return AsCoreType(aInstance).Get<FactoryDiags::Diags>().ProcessLine(aString, aOutput, aOutputMaxLen);
+    return AsCoreType(aInstance).Get<FactoryDiags::Diags>().ProcessLine(aString);
 }
 
-otError otDiagProcessCmd(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[], char *aOutput, size_t aOutputMaxLen)
+otError otDiagProcessCmd(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
-    return AsCoreType(aInstance).Get<FactoryDiags::Diags>().ProcessCmd(aArgsLength, aArgs, aOutput, aOutputMaxLen);
+    return AsCoreType(aInstance).Get<FactoryDiags::Diags>().ProcessCmd(aArgsLength, aArgs);
 }
 
 bool otDiagIsEnabled(otInstance *aInstance) { return AsCoreType(aInstance).Get<FactoryDiags::Diags>().IsEnabled(); }
 
+void otDiagSetOutputCallback(otInstance *aInstance, otDiagOutputCallback aCallback, void *aContext)
+{
+    AsCoreType(aInstance).Get<FactoryDiags::Diags>().SetOutputCallback(aCallback, aContext);
+}
 #endif // OPENTHREAD_CONFIG_DIAG_ENABLE