From 67fbb7391031e561b6bfe633e18b67de273f6a21 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Wed, 10 Aug 2022 11:23:37 +0800
Subject: [PATCH] build: release ver-3.0.0.10003

---
 include/os/osSystem.h     |  1 +
 source/os/src/osSysinfo.c | 12 +++++++++++-
 source/os/src/osSystem.c  | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/os/osSystem.h b/include/os/osSystem.h
index 6770be6e46..c5b8fc7be7 100644
--- a/include/os/osSystem.h
+++ b/include/os/osSystem.h
@@ -32,6 +32,7 @@ extern "C" {
 typedef struct TdCmd *TdCmdPtr;
 
 TdCmdPtr taosOpenCmd(const char* cmd);
+int64_t  taosGetsCmd(TdCmdPtr pCmd, int32_t maxSize, char *__restrict buf);
 int64_t  taosGetLineCmd(TdCmdPtr pCmd, char** __restrict ptrBuf);
 int32_t  taosEOFCmd(TdCmdPtr pCmd);
 int64_t  taosCloseCmd(TdCmdPtr* ppCmd);
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 3e68b6e086..3a75e18a7f 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -398,7 +398,7 @@ int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores) {
   if (line != NULL) taosMemoryFree(line);
   taosCloseFile(&pFile);
 
-  if (code != 0) {
+  if (code != 0 && (done & 1) == 0) {
     TdFilePtr pFile1 = taosOpenFile("/proc/device-tree/model", TD_FILE_READ | TD_FILE_STREAM);
     if (pFile1 == NULL) return code;
     taosGetsFile(pFile1, maxLen, cpuModel);
@@ -407,6 +407,16 @@ int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores) {
     done |= 1;
   }
 
+  if (code != 0 && (done & 1) == 0) {
+    TdCmdPtr pCmd = taosOpenCmd("uname -a");
+    if (pCmd == NULL) return code;
+    if (taosGetsCmd(pCmd, maxLen, cpuModel) > 0) {
+      code = 0;
+      done |= 1;
+    }
+    taosCloseCmd(&pCmd);
+  }
+
   if ((done & 2) == 0) {
   	*numOfCores = coreCount;
   	done |= 2;
diff --git a/source/os/src/osSystem.c b/source/os/src/osSystem.c
index c86cd19e32..b6f6637601 100644
--- a/source/os/src/osSystem.c
+++ b/source/os/src/osSystem.c
@@ -248,6 +248,16 @@ TdCmdPtr taosOpenCmd(const char* cmd) {
 #endif
 }
 
+int64_t taosGetsCmd(TdCmdPtr pCmd, int32_t maxSize, char *__restrict buf) {
+  if (pCmd == NULL || buf == NULL) {
+    return -1;
+  }
+  if (fgets(buf, maxSize, (FILE*)pCmd) == NULL) {
+    return -1;
+  }
+  return strlen(buf);
+}
+
 int64_t taosGetLineCmd(TdCmdPtr pCmd, char** __restrict ptrBuf) {
   if (pCmd == NULL || ptrBuf == NULL) {
     return -1;