* use a new api to catch SIGINT

sipeed · May 30, 2024 · 31cc350 · 31cc350
1 parent e527dbd
commit 31cc350
Show file tree

Hide file tree

Showing 31 changed files with 66 additions and 63 deletions.
diff --git a/components/basic/port/linux/maix_sys_linux.cpp b/components/basic/port/linux/maix_sys_linux.cpp
@@ -6,17 +6,18 @@ namespace maix::sys
 {
     static void signal_handle(int signal)
     {
-        const char *signal_msg = NULL;
         switch (signal) {
         case SIGINT:
             maix::app::set_exit_flag(true);
+#if CONFIG_BUILD_WITH_MAIXPY
             raise(SIGINT);
+#endif
         break;
-        default: signal_msg = "UNKNOWN"; break;
+        default: break;
         }
     }
 
     void register_default_signal_handle() {
-        signal(SIGILL, signal_handle);
+        signal(SIGINT, signal_handle);
     }
 }
diff --git a/components/basic/port/maixcam/maix_sys_maixcam.cpp b/components/basic/port/maixcam/maix_sys_maixcam.cpp
@@ -6,17 +6,18 @@ namespace maix::sys
 {
     static void signal_handle(int signal)
     {
-        const char *signal_msg = NULL;
         switch (signal) {
         case SIGINT:
             maix::app::set_exit_flag(true);
+#if CONFIG_BUILD_WITH_MAIXPY
             raise(SIGINT);
+#endif
         break;
-        default: signal_msg = "UNKNOWN"; break;
+        default: break;
         }
     }
 
     void register_default_signal_handle() {
-        signal(SIGILL, signal_handle);
+        signal(SIGINT, signal_handle);
     }
 }
diff --git a/components/vision/port/linux/maix_rtmp_linux.cpp b/components/vision/port/linux/maix_rtmp_linux.cpp
@@ -1,11 +1,12 @@
 #include "maix_rtmp.hpp"
 
 namespace maix::rtmp {
-	Rtmp::Rtmp(std::string host, int port, std::string app, std::string stream) {
+	Rtmp::Rtmp(std::string host, int port, std::string app, std::string stream, int bitrate) {
 		_host = host;
 		_port = port;
 		_app = app;
 		_stream = stream;
+		_bitrate = bitrate;
 	}
 
 	Rtmp::~Rtmp() {

diff --git a/examples/audio_demo/main/src/main.cpp b/examples/audio_demo/main/src/main.cpp
@@ -185,8 +185,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/camera_display/main/src/main.cpp b/examples/camera_display/main/src/main.cpp
@@ -193,8 +193,8 @@ static int cmd_loop(camera::Camera *cam)
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/comm_protocol/main/src/main.cpp b/examples/comm_protocol/main/src/main.cpp
@@ -45,8 +45,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/comm_uart/main/src/main.cpp b/examples/comm_uart/main/src/main.cpp
@@ -47,8 +47,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/gui_lvgl/main/src/main.cpp b/examples/gui_lvgl/main/src/main.cpp
@@ -58,8 +58,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/gui_simple/main/src/main.cpp b/examples/gui_simple/main/src/main.cpp
@@ -71,8 +71,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/hello_world/main/src/main.cpp b/examples/hello_world/main/src/main.cpp
@@ -38,8 +38,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/i18n/main/src/main.cpp b/examples/i18n/main/src/main.cpp
@@ -41,8 +41,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/image_method/main/src/main.cpp b/examples/image_method/main/src/main.cpp
@@ -5368,8 +5368,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/image_show/main/src/main.cpp b/examples/image_show/main/src/main.cpp
@@ -55,8 +55,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/jpg_stream_demo/main/src/main.cpp b/examples/jpg_stream_demo/main/src/main.cpp
@@ -53,8 +53,8 @@ std::string html =
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/key_demo/main/src/main.cpp b/examples/key_demo/main/src/main.cpp
@@ -51,8 +51,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/nn_classifier/main/src/main.cpp b/examples/nn_classifier/main/src/main.cpp
@@ -75,8 +75,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/nn_runner/main/src/main.cpp b/examples/nn_runner/main/src/main.cpp
@@ -249,8 +249,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/opencv_demo/main/src/main.cpp b/examples/opencv_demo/main/src/main.cpp
@@ -207,8 +207,8 @@ int _main(int argc, char *argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/peripheral_gpio/main/src/main.cpp b/examples/peripheral_gpio/main/src/main.cpp
@@ -38,8 +38,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/peripheral_i2c_eeprom/main/src/main.cpp b/examples/peripheral_i2c_eeprom/main/src/main.cpp
@@ -82,8 +82,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/peripheral_pwm_servo/main/src/main.cpp b/examples/peripheral_pwm_servo/main/src/main.cpp
@@ -49,8 +49,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/rtmp_demo/main/src/main.cpp b/examples/rtmp_demo/main/src/main.cpp
@@ -111,8 +111,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/rtsp_demo/main/src/main.cpp b/examples/rtsp_demo/main/src/main.cpp
@@ -62,8 +62,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/video_demo/main/src/main.cpp b/examples/video_demo/main/src/main.cpp
@@ -303,8 +303,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/video_record_mp4/main/src/main.cpp b/examples/video_record_mp4/main/src/main.cpp
@@ -37,8 +37,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/websocket_client/main/src/main.cpp b/examples/websocket_client/main/src/main.cpp
@@ -109,8 +109,8 @@ int _main(int argc, char* argv[]) {
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/websocket_server/main/src/main.cpp b/examples/websocket_server/main/src/main.cpp
@@ -68,8 +68,8 @@ int _main(int argc, char* argv[]) {
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/examples/wifi_demo/main/src/main.cpp b/examples/wifi_demo/main/src/main.cpp
@@ -44,8 +44,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/test/cvi_tpu_demo/main/src/main.cpp b/test/cvi_tpu_demo/main/src/main.cpp
@@ -134,8 +134,8 @@ int _main(int argc, char **argv) {
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/test/cvi_tpu_matmul/main/src/main.cpp b/test/cvi_tpu_matmul/main/src/main.cpp
@@ -124,8 +124,8 @@ int _main(int argc, char **argv) {
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.

diff --git a/tools/project_template/main/src/main.cpp b/tools/project_template/main/src/main.cpp
@@ -26,8 +26,8 @@ int _main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    // Catch SIGINT signal(e.g. Ctrl + C), and set exit flag to true.
-    signal(SIGINT, [](int sig){ app::set_exit_flag(true); });
+    // Catch signal and process
+    sys::register_default_signal_handle();
 
     // Use CATCH_EXCEPTION_RUN_RETURN to catch exception,
     // if we don't catch exception, when program throw exception, the objects will not be destructed.