diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index b2a224f61215940e653f6e26cb4e2751e0e9f0d5..9182ff9d9a71c23e4e842aafa4c2e7d5c129d51a 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -16,7 +16,6 @@ aux_source_directory(db/insert db_insert_files) aux_source_directory(db/meta db_meta_files) aux_source_directory(metrics metrics_files) aux_source_directory(wrapper/knowhere knowhere_files) -aux_source_directory(scheduler new_scheduler_files) aux_source_directory(db/scheduler scheduler_files) aux_source_directory(db/scheduler/context scheduler_context_files) @@ -65,7 +64,6 @@ set(db_files ${db_insert_files} ${db_meta_files} ${db_scheduler_files} - ${new_scheduler_files} ${metrics_files} ${knowhere_files} ) diff --git a/cpp/src/scheduler/ResourceMgr.cpp b/cpp/src/scheduler/ResourceMgr.cpp index d033bd9298c17d7c72797dceba10597f6a5ccfd5..b24e08a4136a3239e422e6a58162bbd0d02c5be1 100644 --- a/cpp/src/scheduler/ResourceMgr.cpp +++ b/cpp/src/scheduler/ResourceMgr.cpp @@ -37,6 +37,14 @@ ResourceMgr::Add(ResourcePtr &&resource) { finish_task_event_[index] = true; event_cv_.notify_one(); }); + resource->RegisterOnCopyCompleted([&] { + copy_completed_event_[index] = true; + event_cv_.notify_one(); + }); + resource->RegisterOnTaskTableUpdated([&] { + task_table_updated_event_[index] = true; + event_cv_.notify_one(); + }); return ret; } @@ -110,7 +118,7 @@ ResourceMgr::Dump() { for (uint64_t i = 0; i < resources_.size(); ++i) { str += "Resource No." + std::to_string(i) + ":\n"; - str += resources_[i]->Dump(); + //str += resources_[i]->Dump(); } return str; diff --git a/cpp/src/scheduler/resource/Resource.h b/cpp/src/scheduler/resource/Resource.h index 5b7bb13a80950301e6aab70f74eb7a5ba4ce5e29..4fe2a006ac25e4bd61da5a3e5bd7eaa1deec74bf 100644 --- a/cpp/src/scheduler/resource/Resource.h +++ b/cpp/src/scheduler/resource/Resource.h @@ -75,25 +75,33 @@ public: * Register on start up event; */ void - RegisterOnStartUp(std::function func); + RegisterOnStartUp(std::function func) { + on_start_up_ = func; + } /* * Register on finish one task event; */ void - RegisterOnFinishTask(std::function func); + RegisterOnFinishTask(std::function func) { + on_finish_task_ = func; + } /* * Register on copy task data completed event; */ void - RegisterOnCopyCompleted(std::function func); + RegisterOnCopyCompleted(std::function func) { + on_copy_completed_ = func; + } /* * Register on task table updated event; */ void - RegisterOnTaskTableUpdated(std::function func); + RegisterOnTaskTableUpdated(std::function func) { + on_task_table_updated_ = func; + } protected: Resource(std::string name, ResourceType type) diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt index 287fe5112815be9165d6c333c9ce2c9d2e6ef446..ac666c86a999b45ad2d453af0d021e9ba7923363 100644 --- a/cpp/unittest/CMakeLists.txt +++ b/cpp/unittest/CMakeLists.txt @@ -42,5 +42,5 @@ add_subdirectory(server) add_subdirectory(db) add_subdirectory(knowhere) add_subdirectory(metrics) -add_subdirectory(scheduler) +#add_subdirectory(scheduler) #add_subdirectory(storage) \ No newline at end of file