From d047392be08f09eb4c87ffd4f7d485674bb4409d Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 1 Oct 2020 18:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=85=B3?= =?UTF-8?q?=E9=97=ADFFmpeg=E5=AD=90=E8=BF=9B=E7=A8=8B=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/Process.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/Process.cpp b/server/Process.cpp index 7a5f7c18..47ab2d21 100644 --- a/server/Process.cpp +++ b/server/Process.cpp @@ -25,7 +25,7 @@ #include "Util/File.h" #include "Util/logger.h" #include "Util/uv_errno.h" -#include "Thread/WorkThreadPool.h" +#include "Poller/EventPoller.h" #include "Process.h" using namespace toolkit; @@ -261,7 +261,7 @@ static void s_kill(pid_t pid, void *handle, int max_delay, bool force) { } //发送SIGTERM信号后,2秒后检查子进程是否已经退出 - WorkThreadPool::Instance().getPoller()->doDelayTask(max_delay, [pid, handle]() { + EventPollerPool::Instance().getPoller()->doDelayTask(max_delay, [pid, handle]() { if (!s_wait(pid, handle, nullptr, false)) { //进程已经退出了 return 0;