src: move ThreadPoolWork inlines into a -inl.h
The presence of the inline definitions in node_internals.h can cause all files that include node_internals.h to depend on util-inl.h, even if they never use ThreadPoolWork. Whether this happens depends on the toolchain, gcc will strip unused definitions, clang won't. PR-URL: https://github.com/nodejs/node/pull/27755 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
cb16872416
commit
6ded4f2bad
@ -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>
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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 "," \
|
||||
|
@ -24,6 +24,7 @@
|
||||
|
||||
#include "async_wrap-inl.h"
|
||||
#include "env-inl.h"
|
||||
#include "threadpoolwork-inl.h"
|
||||
#include "util-inl.h"
|
||||
|
||||
#include "v8.h"
|
||||
|
57
src/threadpoolwork-inl.h
Normal file
57
src/threadpoolwork-inl.h
Normal file
@ -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_
|
Loading…
x
Reference in New Issue
Block a user