-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #633 from lukemartinlogan/dev
Make it so flushing doesn't cause stall
- Loading branch information
Showing
53 changed files
with
1,386 additions
and
616 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,196 +1,11 @@ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | ||
| * Distributed under BSD 3-Clause license. * | ||
| * Copyright by The HDF Group. * | ||
| * Copyright by the Illinois Institute of Technology. * | ||
| * All rights reserved. * | ||
| * * | ||
| * This file is part of Hermes. The full Hermes copyright notice, including * | ||
| * terms governing use, modification, and redistribution, is contained in * | ||
| * the COPYING file, which can be found at the top directory. If you do not * | ||
| * have access to the file, you may request a copy from [email protected]. * | ||
| * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| // | ||
| // Created by lukemartinlogan on 10/24/23. | ||
| // | ||
|
|
||
| #ifndef HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ | ||
| #define HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ | ||
| #ifndef HERMES_HRUN_INCLUDE_HRUN_API_HRUN_RUNTIME_H_ | ||
| #define HERMES_HRUN_INCLUDE_HRUN_API_HRUN_RUNTIME_H_ | ||
|
|
||
| #include "hrun/task_registry/task_registry.h" | ||
| #include "hrun/work_orchestrator/work_orchestrator.h" | ||
| #include "hrun/queue_manager/queue_manager_runtime.h" | ||
| #include "hrun_admin/hrun_admin.h" | ||
| #include "remote_queue/remote_queue.h" | ||
| #include "hrun_client.h" | ||
| #include "manager.h" | ||
| #include "hrun/network/rpc.h" | ||
| #include "hrun/network/rpc_thallium.h" | ||
| #include "hrun_runtime_.h" | ||
| #include "hrun/work_orchestrator/worker.h" | ||
|
|
||
| // Singleton macros | ||
| #define HRUN_RUNTIME hshm::Singleton<hrun::Runtime>::GetInstance() | ||
| #define HRUN_RUNTIME_T hrun::Runtime* | ||
| #define HRUN_REMOTE_QUEUE (&HRUN_RUNTIME->remote_queue_) | ||
| #define HRUN_THALLIUM (&HRUN_RUNTIME->thallium_) | ||
| #define HRUN_RPC (&HRUN_RUNTIME->rpc_) | ||
|
|
||
| namespace hrun { | ||
|
|
||
| class Runtime : public ConfigurationManager { | ||
| public: | ||
| int data_; | ||
| TaskRegistry task_registry_; | ||
| WorkOrchestrator work_orchestrator_; | ||
| QueueManagerRuntime queue_manager_; | ||
| remote_queue::Client remote_queue_; | ||
| RpcContext rpc_; | ||
| ThalliumRpc thallium_; | ||
| bool remote_created_ = false; | ||
|
|
||
| public: | ||
| /** Default constructor */ | ||
| Runtime() = default; | ||
|
|
||
| /** Create the server-side API */ | ||
| Runtime* Create(std::string server_config_path = "") { | ||
| hshm::ScopedMutex lock(lock_, 1); | ||
| if (is_initialized_) { | ||
| return this; | ||
| } | ||
| mode_ = HrunMode::kServer; | ||
| is_being_initialized_ = true; | ||
| ServerInit(std::move(server_config_path)); | ||
| is_initialized_ = true; | ||
| is_being_initialized_ = false; | ||
| return this; | ||
| } | ||
|
|
||
| private: | ||
| /** Initialize */ | ||
| void ServerInit(std::string server_config_path) { | ||
| LoadServerConfig(server_config_path); | ||
| InitSharedMemory(); | ||
| rpc_.ServerInit(&server_config_); | ||
| thallium_.ServerInit(&rpc_); | ||
| header_->node_id_ = rpc_.node_id_; | ||
| header_->unique_ = 0; | ||
| header_->num_nodes_ = server_config_.rpc_.host_names_.size(); | ||
| task_registry_.ServerInit(&server_config_, rpc_.node_id_, header_->unique_); | ||
| // Queue manager + client must be initialized before Work Orchestrator | ||
| queue_manager_.ServerInit(main_alloc_, | ||
| rpc_.node_id_, | ||
| &server_config_, | ||
| header_->queue_manager_); | ||
| HRUN_CLIENT->Create(server_config_path, "", true); | ||
| HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kPthread); | ||
| work_orchestrator_.ServerInit(&server_config_, queue_manager_); | ||
| hipc::mptr<Admin::CreateTaskStateTask> admin_task; | ||
|
|
||
| // Create the admin library | ||
| HRUN_CLIENT->MakeTaskStateId(); | ||
| admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>(); | ||
| task_registry_.RegisterTaskLib("hrun_admin"); | ||
| task_registry_.CreateTaskState( | ||
| "hrun_admin", | ||
| "hrun_admin", | ||
| HRUN_QM_CLIENT->admin_task_state_, | ||
| admin_task.get()); | ||
|
|
||
| // Create the process queue | ||
| HRUN_CLIENT->MakeTaskStateId(); | ||
| admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>(); | ||
| task_registry_.RegisterTaskLib("proc_queue"); | ||
| task_registry_.CreateTaskState( | ||
| "proc_queue", | ||
| "proc_queue", | ||
| HRUN_QM_CLIENT->process_queue_, | ||
| admin_task.get()); | ||
|
|
||
| // Create the work orchestrator queue scheduling library | ||
| TaskStateId queue_sched_id = HRUN_CLIENT->MakeTaskStateId(); | ||
| admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>(); | ||
| task_registry_.RegisterTaskLib("worch_queue_round_robin"); | ||
| task_registry_.CreateTaskState( | ||
| "worch_queue_round_robin", | ||
| "worch_queue_round_robin", | ||
| queue_sched_id, | ||
| admin_task.get()); | ||
|
|
||
| // Create the work orchestrator process scheduling library | ||
| TaskStateId proc_sched_id = HRUN_CLIENT->MakeTaskStateId(); | ||
| admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>(); | ||
| task_registry_.RegisterTaskLib("worch_proc_round_robin"); | ||
| task_registry_.CreateTaskState( | ||
| "worch_proc_round_robin", | ||
| "worch_proc_round_robin", | ||
| proc_sched_id, | ||
| admin_task.get()); | ||
|
|
||
| // Set the work orchestrator queue scheduler | ||
| HRUN_ADMIN->SetWorkOrchQueuePolicyRoot(hrun::DomainId::GetLocal(), queue_sched_id); | ||
| HRUN_ADMIN->SetWorkOrchProcPolicyRoot(hrun::DomainId::GetLocal(), proc_sched_id); | ||
|
|
||
| // Create the remote queue library | ||
| task_registry_.RegisterTaskLib("remote_queue"); | ||
| remote_queue_.CreateRoot(DomainId::GetLocal(), "remote_queue", | ||
| HRUN_CLIENT->MakeTaskStateId()); | ||
| remote_created_ = true; | ||
| } | ||
|
|
||
| public: | ||
| /** Initialize shared-memory between daemon and client */ | ||
| void InitSharedMemory() { | ||
| // Create shared-memory allocator | ||
| auto mem_mngr = HERMES_MEMORY_MANAGER; | ||
| if (server_config_.queue_manager_.shm_size_ == 0) { | ||
| server_config_.queue_manager_.shm_size_ = | ||
| hipc::MemoryManager::GetDefaultBackendSize(); | ||
| } | ||
| mem_mngr->CreateBackend<hipc::PosixShmMmap>( | ||
| server_config_.queue_manager_.shm_size_, | ||
| server_config_.queue_manager_.shm_name_); | ||
| main_alloc_ = | ||
| mem_mngr->CreateAllocator<hipc::ScalablePageAllocator>( | ||
| server_config_.queue_manager_.shm_name_, | ||
| main_alloc_id_, | ||
| sizeof(HrunShm)); | ||
| header_ = main_alloc_->GetCustomHeader<HrunShm>(); | ||
| } | ||
|
|
||
| /** Finalize Hermes explicitly */ | ||
| void Finalize() {} | ||
|
|
||
| /** Run the Hermes core Daemon */ | ||
| void RunDaemon() { | ||
| thallium_.RunDaemon(); | ||
| HILOG(kInfo, "Daemon is running") | ||
| // while (HRUN_WORK_ORCHESTRATOR->IsRuntimeAlive()) { | ||
| // // Scheduler callbacks? | ||
| // HERMES_THREAD_MODEL->SleepForUs(1000); | ||
| // } | ||
| HILOG(kInfo, "Finishing up last requests") | ||
| HRUN_WORK_ORCHESTRATOR->Join(); | ||
| HILOG(kInfo, "Daemon is exiting") | ||
| } | ||
|
|
||
| /** Stop the Hermes core Daemon */ | ||
| void StopDaemon() { | ||
| HRUN_WORK_ORCHESTRATOR->FinalizeRuntime(); | ||
| } | ||
|
|
||
| /** Get the set of DomainIds */ | ||
| std::vector<DomainId> ResolveDomainId(const DomainId &domain_id) { | ||
| std::vector<DomainId> ids; | ||
| if (domain_id.IsGlobal()) { | ||
| ids.reserve(rpc_.hosts_.size()); | ||
| for (HostInfo &host_info : rpc_.hosts_) { | ||
| ids.push_back(DomainId::GetNode(host_info.node_id_)); | ||
| } | ||
| } else if (domain_id.IsNode()) { | ||
| ids.reserve(1); | ||
| ids.push_back(domain_id); | ||
| } | ||
| // TODO(llogan): handle named domain ID sets | ||
| return ids; | ||
| } | ||
| }; | ||
|
|
||
| } // namespace hrun | ||
|
|
||
| #endif // HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ | ||
| #endif // HERMES_HRUN_INCLUDE_HRUN_API_HRUN_RUNTIME_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | ||
| * Distributed under BSD 3-Clause license. * | ||
| * Copyright by The HDF Group. * | ||
| * Copyright by the Illinois Institute of Technology. * | ||
| * All rights reserved. * | ||
| * * | ||
| * This file is part of Hermes. The full Hermes copyright notice, including * | ||
| * terms governing use, modification, and redistribution, is contained in * | ||
| * the COPYING file, which can be found at the top directory. If you do not * | ||
| * have access to the file, you may request a copy from [email protected]. * | ||
| * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
|
|
||
| #ifndef HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ | ||
| #define HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ | ||
|
|
||
| #include "hrun/task_registry/task_registry.h" | ||
| #include "hrun/work_orchestrator/work_orchestrator.h" | ||
| #include "hrun/queue_manager/queue_manager_runtime.h" | ||
| #include "hrun_admin/hrun_admin.h" | ||
| #include "remote_queue/remote_queue.h" | ||
| #include "hrun_client.h" | ||
| #include "manager.h" | ||
| #include "hrun/network/rpc.h" | ||
| #include "hrun/network/rpc_thallium.h" | ||
|
|
||
| // Singleton macros | ||
| #define HRUN_RUNTIME hshm::Singleton<hrun::Runtime>::GetInstance() | ||
| #define HRUN_RUNTIME_T hrun::Runtime* | ||
| #define HRUN_REMOTE_QUEUE (&HRUN_RUNTIME->remote_queue_) | ||
| #define HRUN_THALLIUM (&HRUN_RUNTIME->thallium_) | ||
| #define HRUN_RPC (&HRUN_RUNTIME->rpc_) | ||
|
|
||
| namespace hrun { | ||
|
|
||
| class Runtime : public ConfigurationManager { | ||
| public: | ||
| int data_; | ||
| TaskRegistry task_registry_; | ||
| WorkOrchestrator work_orchestrator_; | ||
| QueueManagerRuntime queue_manager_; | ||
| remote_queue::Client remote_queue_; | ||
| RpcContext rpc_; | ||
| ThalliumRpc thallium_; | ||
| bool remote_created_ = false; | ||
|
|
||
| public: | ||
| /** Default constructor */ | ||
| Runtime() = default; | ||
|
|
||
| /** Create the server-side API */ | ||
| Runtime* Create(std::string server_config_path = ""); | ||
|
|
||
| private: | ||
| /** Initialize */ | ||
| void ServerInit(std::string server_config_path); | ||
|
|
||
| public: | ||
| /** Initialize shared-memory between daemon and client */ | ||
| void InitSharedMemory(); | ||
|
|
||
| /** Finalize Hermes explicitly */ | ||
| void Finalize(); | ||
|
|
||
| /** Run the Hermes core Daemon */ | ||
| void RunDaemon(); | ||
|
|
||
| /** Stop the Hermes core Daemon */ | ||
| void StopDaemon(); | ||
|
|
||
| /** Get the set of DomainIds */ | ||
| std::vector<DomainId> ResolveDomainId(const DomainId &domain_id); | ||
| }; | ||
|
|
||
| } // namespace hrun | ||
|
|
||
| #endif // HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.