Skip to content

Commit be8772c

Browse files
committed
bugfix in unittest
1 parent def3f16 commit be8772c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ucm/store/cache/cc/dump_queue.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,13 @@ Status DumpQueue::DumpOneTask(Trans::Stream* stream, size_t tensorSize, TaskPtr
136136
void DumpQueue::BackendDumpStage()
137137
{
138138
dumping_.ConsumerLoop(stop_, [this](auto&& task) {
139-
static Detail::TaskHandle finishedBackendTaskHandle = 0;
140-
if (task.backendTaskHandle > finishedBackendTaskHandle) {
139+
if (task.backendTaskHandle > finishedBackendTaskHandle_) {
141140
auto s = backend_->Wait(task.backendTaskHandle);
142141
if (s.Failure()) {
143142
UC_ERROR("Failed({}) to wait backend task({}).", s, task.backendTaskHandle);
144143
return;
145144
}
146-
finishedBackendTaskHandle = task.backendTaskHandle;
145+
finishedBackendTaskHandle_ = task.backendTaskHandle;
147146
}
148147
});
149148
}

ucm/store/cache/cc/dump_queue.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class DumpQueue {
4848

4949
private:
5050
alignas(64) std::atomic_bool stop_{false};
51+
Detail::TaskHandle finishedBackendTaskHandle_{0};
5152
TaskIdSet* failureSet_{nullptr};
5253
TransBuffer* buffer_{nullptr};
5354
Store* backend_{nullptr};

ucm/store/cache/cc/load_queue.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ void LoadQueue::TransferStage(int32_t deviceId, size_t tensorSize, std::promise<
121121

122122
void LoadQueue::TransferOneTask(Trans::Stream* stream, size_t tensorSize, ShardTask&& task)
123123
{
124-
static Detail::TaskHandle finishedBackendTaskHandle = 0;
125-
if (task.backendTaskHandle > finishedBackendTaskHandle) {
124+
if (task.backendTaskHandle > finishedBackendTaskHandle_) {
126125
auto s = backend_->Wait(task.backendTaskHandle);
127126
if (s.Failure()) [[unlikely]] {
128127
failureSet_->Insert(task.taskHandle);
@@ -131,7 +130,7 @@ void LoadQueue::TransferOneTask(Trans::Stream* stream, size_t tensorSize, ShardT
131130
return;
132131
}
133132
task.bufferHandle.MarkReady();
134-
finishedBackendTaskHandle = task.backendTaskHandle;
133+
finishedBackendTaskHandle_ = task.backendTaskHandle;
135134
}
136135
for (;;) {
137136
if (failureSet_->Contains(task.taskHandle)) {

ucm/store/cache/cc/load_queue.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class LoadQueue {
5151

5252
private:
5353
alignas(64) std::atomic_bool stop_{false};
54+
Detail::TaskHandle finishedBackendTaskHandle_{0};
5455
TaskIdSet* failureSet_{nullptr};
5556
TransBuffer* buffer_{nullptr};
5657
Store* backend_{nullptr};

0 commit comments

Comments
 (0)