From 643fa4fb905f4022ed3272485a25d30428718e10 Mon Sep 17 00:00:00 2001 From: vdeo Date: Thu, 19 Dec 2024 00:44:06 +0100 Subject: [PATCH 1/2] [compilation] CMake to search for libreadline. Should fix #5. --- src/CommandLineInterface/CMakeLists.txt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/CommandLineInterface/CMakeLists.txt b/src/CommandLineInterface/CMakeLists.txt index 2a2b949a..f468353c 100644 --- a/src/CommandLineInterface/CMakeLists.txt +++ b/src/CommandLineInterface/CMakeLists.txt @@ -13,6 +13,7 @@ find_package(GSL QUIET REQUIRED) pkg_check_modules(FFTW REQUIRED fftw3) pkg_check_modules(FFTWF REQUIRED fftw3f) pkg_check_modules(NCURSES REQUIRED ncurses) +pkg_check_modules(READLINE REQUIRED readline) find_package(OpenMP) pkg_check_modules(HWLOC hwloc) @@ -187,7 +188,7 @@ install(FILES CLIcore.h standalone_dependencies.h timeutils.h DESTINATION include/${SRCNAME}) - + install(FILES CLIcore/CLIcore_UI.h CLIcore/CLIcore_checkargs.h CLIcore/CLIcore_datainit.h @@ -198,7 +199,7 @@ install(FILES CLIcore/CLIcore_UI.h CLIcore/CLIcore_signals.h CLIcore/CLIcore_utils.h DESTINATION include/${SRCNAME}/CLIcore) - + install(FILES fps/fps_CONFstart.h fps/fps_CONFstop.h fps/fps_FPCONFexit.h @@ -235,7 +236,7 @@ install(FILES fps/fps_CONFstart.h fps/fps_tmux.h fps/fps_userinputsetparamvalue.h DESTINATION include/${SRCNAME}/fps) - + install(FILES fpsCTRL/fpsCTRL_FPSdisplay.h fpsCTRL/fpsCTRL_TUI.h fpsCTRL/fpsCTRL_TUI_process_user_key.h @@ -243,14 +244,14 @@ install(FILES fpsCTRL/fpsCTRL_FPSdisplay.h fpsCTRL/print_nodeinfo.h fpsCTRL/scheduler_display.h DESTINATION include/${SRCNAME}/fpsCTRL) - + install(FILES procCTRL/procCTRL_GetCPUloads.h procCTRL/procCTRL_GetNumberCPUs.h procCTRL/procCTRL_PIDcollectSystemInfo.h procCTRL/procCTRL_TUI.h procCTRL/procCTRL_processinfo_scan.h DESTINATION include/${SRCNAME}/procCTRL) - + install(FILES processinfo/processinfo_SIGexit.h processinfo/processinfo_WriteMessage.h processinfo/processinfo_exec_end.h @@ -263,9 +264,9 @@ install(FILES processinfo/processinfo_SIGexit.h processinfo/processinfo_shm_link.h processinfo/processinfo_shm_list_create.h processinfo/processinfo_signals.h - processinfo/processinfo_update_output_stream.h + processinfo/processinfo_update_output_stream.h DESTINATION include/${SRCNAME}/processinfo) - + install(FILES streamCTRL/streamCTRL_TUI.h DESTINATION include/${SRCNAME}/streamCTRL) @@ -281,7 +282,3 @@ add_test (NAME milklistim COMMAND milk-exec "listim") set_property (TEST milklistim PROPERTY LABELS "CLI") set_tests_properties(milklistim PROPERTIES TIMEOUT 1) set_property (TEST milklistim PROPERTY PASS_REGULAR_EXPRESSION "0 image") - - - - From 66e5b38b7c3bd0b3a29a3cd41d9c917326c38a4c Mon Sep 17 00:00:00 2001 From: vdeo Date: Tue, 7 Jan 2025 13:24:33 +0100 Subject: [PATCH 2/2] [pyFps] Try mean to trigger confupdate --- python_module/CacaoProcessTools.cpp | 5 ++++- python_module/pyFps.hpp | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/python_module/CacaoProcessTools.cpp b/python_module/CacaoProcessTools.cpp index 5b485729..a15b48ca 100644 --- a/python_module/CacaoProcessTools.cpp +++ b/python_module/CacaoProcessTools.cpp @@ -611,7 +611,10 @@ If entry already exists, do not modify it [](pyFps &cls) { return cls.keys(); }) - + .def("signal_update", + &pyFps::signal_update, + R"pbdoc(Send update signal to FPS +)pbdoc") .def("CONFstart", &pyFps::CONFstart, R"pbdoc(FPS start CONF process diff --git a/python_module/pyFps.hpp b/python_module/pyFps.hpp index f2df2500..da05ed78 100644 --- a/python_module/pyFps.hpp +++ b/python_module/pyFps.hpp @@ -297,6 +297,12 @@ class pyFps return levelKeys; } + void signal_update() + { + fps_.md->signal |= + FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update + } + errno_t CONFstart() { return functionparameter_CONFstart(&fps_);