TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Internal API fix

Browse Source 
PiperOrigin-RevId: 653475092
This commit is contained in:
Guogang Li
2024-07-17 22:02:13 -07:00
committed by Copybara-Service
parent 304a0e2851
commit d576caa4f3
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/scheduled_executor.cc
+12 -4
View File
@@ -16,7 +16,6 @@
#include <crtdbg.h>
#include <algorithm>
#include <memory>
#include <utility>
@@ -25,6 +24,7 @@
#include "internal/platform/flags/nearby_platform_feature_flags.h"
#include "internal/platform/implementation/cancelable.h"
#include "internal/platform/logging.h"
#include "internal/platform/mutex_lock.h"
#include "internal/platform/runnable.h"
namespace nearby {
@@ -40,6 +40,7 @@ ScheduledExecutor::ScheduledExecutor()
// using std:shared_ptr<> instead of std::unique_ptr<>.
std::shared_ptr<api::Cancelable> ScheduledExecutor::Schedule(
Runnable&& runnable, absl::Duration duration) {
MutexLock lock(&mutex_);
if (NearbyFlags::GetInstance().GetBoolFlag(
platform::config_package_nearby::nearby_platform_feature::
kEnableTaskScheduler)) {
@@ -53,9 +54,14 @@ std::shared_ptr<api::Cancelable> ScheduledExecutor::Schedule(
}
// Cleans completed tasks
(void)std::remove_if(
scheduled_tasks_.begin(), scheduled_tasks_.end(),
[](std::shared_ptr<ScheduledTask>& task) { return task->IsDone(); });
auto it = scheduled_tasks_.begin();
while (it != scheduled_tasks_.end()) {
if ((*it)->IsDone()) {
it = scheduled_tasks_.erase(it);
} else {
++it;
}
}
std::shared_ptr<ScheduledTask> task =
std::make_shared<ScheduledTask>(std::move(runnable), duration);
@@ -67,6 +73,7 @@ std::shared_ptr<api::Cancelable> ScheduledExecutor::Schedule(
}
void ScheduledExecutor::Execute(Runnable&& runnable) {
MutexLock lock(&mutex_);
if (shut_down_) {
NEARBY_LOGS(ERROR) << __func__
<< ": Attempt to Execute on a shut down executor.";
@@ -77,6 +84,7 @@ void ScheduledExecutor::Execute(Runnable&& runnable) {
}
void ScheduledExecutor::Shutdown() {
MutexLock lock(&mutex_);
if (!shut_down_) {
shut_down_ = true;
for (auto& task : scheduled_tasks_) {
internal/platform/implementation/windows/scheduled_executor.h
+14 -8
View File
@@ -22,12 +22,14 @@
#include <utility>
#include <vector>
#include "absl/base/thread_annotations.h"
#include "absl/synchronization/notification.h"
#include "absl/time/time.h"
#include "internal/platform/implementation/cancelable.h"
#include "internal/platform/implementation/scheduled_executor.h"
#include "internal/platform/implementation/windows/executor.h"
#include "internal/platform/implementation/windows/task_scheduler.h"
#include "internal/platform/mutex.h"
#include "internal/platform/runnable.h"
namespace nearby {
@@ -50,13 +52,14 @@ class ScheduledExecutor : public api::ScheduledExecutor {
// Exclusive ownership model does not work for this case;
// using std:shared_ptr<> instead if std::unique_ptr<>.
std::shared_ptr<api::Cancelable> Schedule(Runnable&& runnable,
absl::Duration duration) override;
absl::Duration duration) override
ABSL_LOCKS_EXCLUDED(mutex_);
// Executes the runnable task immedately.
void Execute(Runnable&& runnable) override;
// Executes the runnable task immediately.
void Execute(Runnable&& runnable) override ABSL_LOCKS_EXCLUDED(mutex_);
// Shutdowns the executor, all scheduled task will be cancelled.
void Shutdown() override;
void Shutdown() override ABSL_LOCKS_EXCLUDED(mutex_);
private:
class ScheduledTask : public api::Cancelable {
@@ -94,10 +97,13 @@ class ScheduledExecutor : public api::ScheduledExecutor {
bool is_executed_ = false;
};
std::unique_ptr<nearby::windows::Executor> executor_ = nullptr;
std::vector<std::shared_ptr<ScheduledTask>> scheduled_tasks_;
std::atomic_bool shut_down_ = false;
TaskScheduler task_scheduler_;
Mutex mutex_;
std::unique_ptr<nearby::windows::Executor> executor_ ABSL_GUARDED_BY(mutex_) =
nullptr;
std::vector<std::shared_ptr<ScheduledTask>> scheduled_tasks_
ABSL_GUARDED_BY(mutex_);
std::atomic_bool shut_down_ ABSL_GUARDED_BY(mutex_) = false;
TaskScheduler task_scheduler_ ABSL_GUARDED_BY(mutex_);
};
} // namespace windows