From cbd3c6ecabda28cf43f889f35937c97ccf233dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=A1=E4=B8=9C=E5=B3=B0?= Date: Tue, 12 Aug 2025 12:44:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=8F=E6=B3=95?= =?UTF-8?q?=E8=B6=8A=E7=95=8C=E5=BC=95=E8=B5=B7=E7=9A=84cpp=5Fcrash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 满东峰 --- services/services/monitor/server/monitor_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/services/monitor/server/monitor_server.cpp b/services/services/monitor/server/monitor_server.cpp index 71a04fb7e..6f640f0b6 100644 --- a/services/services/monitor/server/monitor_server.cpp +++ b/services/services/monitor/server/monitor_server.cpp @@ -298,7 +298,7 @@ void MonitorServer::MonitorThread() break; } - waitTime = static_cast(GetTimeMS() - timeStart); + waitTime = GetTimeMS() >= timeStart ? static_cast(GetTimeMS() - timeStart) : 0; for (auto it = timesMap_.begin(); it != timesMap_.end(); it++) { MEDIA_LOGD("pid %{public}d, waitTime %{public}d, timeout %{public}d, trigger %{public}d", -- Gitee From 0f2976eabf39e6809a95cb0a8e27050e62b996ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=A1=E4=B8=9C=E5=B3=B0?= Date: Wed, 13 Aug 2025 07:33:11 +0000 Subject: [PATCH 2/5] update services/services/monitor/server/monitor_server.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 满东峰 --- services/services/monitor/server/monitor_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/services/monitor/server/monitor_server.cpp b/services/services/monitor/server/monitor_server.cpp index 6f640f0b6..f447a7824 100644 --- a/services/services/monitor/server/monitor_server.cpp +++ b/services/services/monitor/server/monitor_server.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ + #include "monitor_server.h" #include #include -- Gitee From ed7b70784b6974a768a0b57c4e7684bcb2b43379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=A1=E4=B8=9C=E5=B3=B0?= Date: Wed, 13 Aug 2025 07:34:01 +0000 Subject: [PATCH 3/5] update services/services/monitor/server/monitor_server.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 满东峰 --- services/services/monitor/server/monitor_server.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/services/monitor/server/monitor_server.cpp b/services/services/monitor/server/monitor_server.cpp index f447a7824..6f640f0b6 100644 --- a/services/services/monitor/server/monitor_server.cpp +++ b/services/services/monitor/server/monitor_server.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "monitor_server.h" #include #include -- Gitee From 39ab31d363fbdd538bd751dfb45500c1dc968ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=A1=E4=B8=9C=E5=B3=B0?= Date: Wed, 13 Aug 2025 07:36:57 +0000 Subject: [PATCH 4/5] update services/services/monitor/server/monitor_server.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 满东峰 --- services/services/monitor/server/monitor_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/services/monitor/server/monitor_server.cpp b/services/services/monitor/server/monitor_server.cpp index 6f640f0b6..f447a7824 100644 --- a/services/services/monitor/server/monitor_server.cpp +++ b/services/services/monitor/server/monitor_server.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ + #include "monitor_server.h" #include #include -- Gitee From f190888d4cd3bf027961d87d8d486bc5f2f143a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=A1=E4=B8=9C=E5=B3=B0?= Date: Wed, 13 Aug 2025 07:37:36 +0000 Subject: [PATCH 5/5] update services/services/monitor/server/monitor_server.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 满东峰 --- services/services/monitor/server/monitor_server.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/services/monitor/server/monitor_server.cpp b/services/services/monitor/server/monitor_server.cpp index f447a7824..6f640f0b6 100644 --- a/services/services/monitor/server/monitor_server.cpp +++ b/services/services/monitor/server/monitor_server.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "monitor_server.h" #include #include -- Gitee