diff --git a/server/robotserver/CMakeLists.txt b/server/robotserver/CMakeLists.txt index c847632..5826ae4 100644 --- a/server/robotserver/CMakeLists.txt +++ b/server/robotserver/CMakeLists.txt @@ -21,12 +21,16 @@ include_directories( /usr/include/eigen3 /usr/include/glm ../../third_party + ../../third_party/behaviac/inc + ../../third_party/recastnavigation/Detour/Include + ../../third_party/recastnavigation/DetourTileCache/Include . ) link_directories( /usr/lib64/mysql /usr/local/lib + ../../third_party/behaviac/lib ) aux_source_directory(../../third_party/a8engine/a8 @@ -37,6 +41,14 @@ aux_source_directory(../../third_party/framework/cpp SRC_LIST ) +aux_source_directory(../../third_party/recastnavigation/Detour/Source + SRC_LIST +) + +aux_source_directory(../../third_party/recastnavigation/DetourTileCache/Source + SRC_LIST +) + aux_source_directory(. SRC_LIST ) @@ -72,4 +84,6 @@ target_link_libraries( curl hiredis tinyxml2 + tcmalloc + behaviac_gcc_debug ) diff --git a/server/robotserver/app.cc b/server/robotserver/app.cc index 377dcaf..1e5e6ad 100755 --- a/server/robotserver/app.cc +++ b/server/robotserver/app.cc @@ -56,7 +56,7 @@ static void SavePerfLog() }); App::Instance()->perf.max_run_delay_time = 0; App::Instance()->perf.max_timer_idle = 0; - f8::HttpClientPool::Instance()->max_request_delay = 0; + f8::HttpClientPool::Instance()->max_user_request_delay = 0; } void App::Init(int argc, char* argv[]) @@ -90,7 +90,7 @@ void App::Init(int argc, char* argv[]) a8::IoLoop::Instance()->Init(); f8::MsgQueue::Instance()->Init(); f8::TGLog::Instance()->Init(a8::Format(PROJ_NAME_FMT, {GAME_ID}), false); - f8::HttpClientPool::Instance()->Init(10); + f8::HttpClientPool::Instance()->Init(10, 1, 10); uuid.SetMachineId(instance_id); VirtualClientMgr::Instance()->Init();