diff options
| -rw-r--r-- | src/node_api.cc | 1 | ||||
| -rw-r--r-- | src/node_crypto.cc | 1 | ||||
| -rw-r--r-- | src/node_internals.h | 21 | ||||
| -rw-r--r-- | src/node_zlib.cc | 1 | ||||
| -rw-r--r-- | src/threadpoolwork-inl.h | 57 |
5 files changed, 60 insertions, 21 deletions
diff --git a/src/node_api.cc b/src/node_api.cc index f8b0d8b550..a6dc4615ca 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -6,6 +6,7 @@ #include "node_binding.h" #include "node_errors.h" #include "node_internals.h" +#include "threadpoolwork-inl.h" #include "util-inl.h" #include <memory> diff --git a/src/node_crypto.cc b/src/node_crypto.cc index bbb07e5b48..f38ed3907d 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -33,6 +33,7 @@ #include "base_object-inl.h" #include "env-inl.h" #include "string_bytes.h" +#include "threadpoolwork-inl.h" #include "util-inl.h" #include "v8.h" diff --git a/src/node_internals.h b/src/node_internals.h index cb039f297b..6aba8eef5d 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -252,27 +252,6 @@ class ThreadPoolWork { uv_work_t work_req_; }; -void ThreadPoolWork::ScheduleWork() { - env_->IncreaseWaitingRequestCounter(); - int status = uv_queue_work( - env_->event_loop(), - &work_req_, - [](uv_work_t* req) { - ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); - self->DoThreadPoolWork(); - }, - [](uv_work_t* req, int status) { - ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); - self->env_->DecreaseWaitingRequestCounter(); - self->AfterThreadPoolWork(status); - }); - CHECK_EQ(status, 0); -} - -int ThreadPoolWork::CancelWork() { - return uv_cancel(reinterpret_cast<uv_req_t*>(&work_req_)); -} - #define TRACING_CATEGORY_NODE "node" #define TRACING_CATEGORY_NODE1(one) \ TRACING_CATEGORY_NODE "," \ diff --git a/src/node_zlib.cc b/src/node_zlib.cc index f389257882..d816c7caff 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -24,6 +24,7 @@ #include "async_wrap-inl.h" #include "env-inl.h" +#include "threadpoolwork-inl.h" #include "util-inl.h" #include "v8.h" diff --git a/src/threadpoolwork-inl.h b/src/threadpoolwork-inl.h new file mode 100644 index 0000000000..8bba988b18 --- /dev/null +++ b/src/threadpoolwork-inl.h @@ -0,0 +1,57 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +#ifndef SRC_THREADPOOLWORK_INL_H_ +#define SRC_THREADPOOLWORK_INL_H_ + +#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#include "util-inl.h" +#include "node_internals.h" + +namespace node { + +void ThreadPoolWork::ScheduleWork() { + env_->IncreaseWaitingRequestCounter(); + int status = uv_queue_work( + env_->event_loop(), + &work_req_, + [](uv_work_t* req) { + ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); + self->DoThreadPoolWork(); + }, + [](uv_work_t* req, int status) { + ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); + self->env_->DecreaseWaitingRequestCounter(); + self->AfterThreadPoolWork(status); + }); + CHECK_EQ(status, 0); +} + +int ThreadPoolWork::CancelWork() { + return uv_cancel(reinterpret_cast<uv_req_t*>(&work_req_)); +} + +} // namespace node + +#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#endif // SRC_THREADPOOLWORK_INL_H_ |