Skip to content

Remove const from AsyncProgressWorker::Signal and AsyncProgressQueueWorker::Signal #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JosephusPaye wants to merge 9 commits into from
+162 −17
Closed

Remove const from AsyncProgressWorker::Signal and AsyncProgressQueueWorker::Signal #1086

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cba2628
Remove const from `Signal()` on async progress workers
JosephusPaye Oct 6, 2021
7fa8746
Remove const from ExecutionProgress param of OnProgress()
JosephusPaye Oct 6, 2021
142cbd6
Add test for AsyncProgressWorker.Signal()
JosephusPaye Oct 6, 2021
5295dc2
Fix test formatting
JosephusPaye Oct 6, 2021
6074571
Add failing test for `AsyncProgressQueueWorker::Signal()`
JosephusPaye Oct 11, 2021
ea3dfe3
Fix formatting
JosephusPaye Oct 11, 2021
7c7bbfc
Apply suggestions from code review
JosephusPaye Oct 27, 2021
928ed84
Add const back to ExecutionProgress
JosephusPaye Oct 27, 2021
8f0b85b
Add back const to Async*Worker::Execute()
JosephusPaye Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for AsyncProgressWorker.Signal()
  • Loading branch information
@JosephusPaye
JosephusPaye committed Oct 6, 2021
commit 142cbd6edc5c44f67c25bfb20a77313147384b80
47 changes: 47 additions & 0 deletions test/async_progress_worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,59 @@ class MalignWorker : public AsyncProgressWorker<ProgressData> {
std::mutex _cvm;
FunctionReference _progress;
};

class SignalTestWorker : public AsyncProgressWorker<ProgressData> {
public:
static void DoWork(const CallbackInfo& info) {
int32_t times = info[0].As<Number>().Int32Value();
Function cb = info[1].As<Function>();
Function progress = info[2].As<Function>();

SignalTestWorker* worker = new SignalTestWorker(
cb, progress, "TestResource", Object::New(info.Env()));
worker->_times = times;
worker->Queue();
}

protected:
void Execute(ExecutionProgress& progress) override {
if (_times < 0) {
SetError("test error");
}
std::unique_lock<std::mutex> lock(_cvm);
for (int32_t idx = 0; idx < _times; idx++) {
progress.Signal();
_cv.wait(lock);
}
}

void OnProgress(const ProgressData* /* data */, size_t /* count */) override {
if (!_progress.IsEmpty()) {
_progress.MakeCallback(Receiver().Value(), {});
}
_cv.notify_one();
}

private:
SignalTestWorker(Function cb,
Function progress,
const char* resource_name,
const Object& resource)
: AsyncProgressWorker(cb, resource_name, resource) {
_progress.Reset(progress, 1);
}
std::condition_variable _cv;
std::mutex _cvm;
int32_t _times;
FunctionReference _progress;
};
} // namespace

Object InitAsyncProgressWorker(Env env) {
Object exports = Object::New(env);
exports["doWork"] = Function::New(env, TestWorker::DoWork);
exports["doMalignTest"] = Function::New(env, MalignWorker::DoWork);
exports["doSignalTest"] = Function::New(env, SignalTestWorker::DoWork);
return exports;
}

Expand Down
21 changes: 21 additions & 0 deletions test/async_progress_worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ async function test({ asyncprogressworker }) {
await success(asyncprogressworker);
await fail(asyncprogressworker);
await malignTest(asyncprogressworker);
await signalTest(asyncprogressworker);
}

function success(binding) {
Expand Down Expand Up @@ -59,3 +60,23 @@ function malignTest(binding) {
);
});
}

function signalTest (binding) {
return new Promise((resolve, reject) => {
const expectedCalls = 3;
let actualCalls = 0;
binding.doWork(expectedCalls,
Comment thread
JosephusPaye marked this conversation as resolved.
Outdated
common.mustCall((err) => {
if (err) {
reject(err);
}
}),
common.mustCall((_progress) => {
actualCalls++;
if (expectedCalls === actualCalls) {
resolve();
}
}, expectedCalls)
);
});
}