|
|
@@ -28,6 +28,7 @@
|
|
|
#include <chrono>
|
|
|
#include <condition_variable>
|
|
|
#include <atomic>
|
|
|
+#include <signal.h>
|
|
|
|
|
|
using json = nlohmann::json;
|
|
|
|
|
|
@@ -2511,6 +2512,9 @@ static void append_to_generated_text_from_generated_token_probs(llama_server_con
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+std::function<void(int)> shutdown_handler;
|
|
|
+inline void signal_handler(int signal) { shutdown_handler(signal); }
|
|
|
+
|
|
|
int main(int argc, char **argv)
|
|
|
{
|
|
|
#if SERVER_VERBOSE != 1
|
|
|
@@ -3128,8 +3132,25 @@ int main(int argc, char **argv)
|
|
|
std::placeholders::_2,
|
|
|
std::placeholders::_3
|
|
|
));
|
|
|
- llama.queue_tasks.start_loop();
|
|
|
|
|
|
+ shutdown_handler = [&](int) {
|
|
|
+ llama.queue_tasks.terminate();
|
|
|
+ };
|
|
|
+
|
|
|
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
|
|
|
+ struct sigaction sigint_action;
|
|
|
+ sigint_action.sa_handler = signal_handler;
|
|
|
+ sigemptyset (&sigint_action.sa_mask);
|
|
|
+ sigint_action.sa_flags = 0;
|
|
|
+ sigaction(SIGINT, &sigint_action, NULL);
|
|
|
+#elif defined (_WIN32)
|
|
|
+ auto console_ctrl_handler = +[](DWORD ctrl_type) -> BOOL {
|
|
|
+ return (ctrl_type == CTRL_C_EVENT) ? (signal_handler(SIGINT), true) : false;
|
|
|
+ };
|
|
|
+ SetConsoleCtrlHandler(reinterpret_cast<PHANDLER_ROUTINE>(console_ctrl_handler), true);
|
|
|
+#endif
|
|
|
+ llama.queue_tasks.start_loop();
|
|
|
+ svr.stop();
|
|
|
t.join();
|
|
|
|
|
|
llama_backend_free();
|