Skip to content

Commit 291cedf

Browse files
joyeecheungaddaleax
joyeecheung
authored and
addaleax
committed
src: reduce includes of node_internals.h
PR-URL: #25507 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent efe089e commit 291cedf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+153
-158
lines changed

Diff for: ‎src/async_wrap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "async_wrap-inl.h"
2323
#include "env-inl.h"
2424
#include "node_errors.h"
25-
#include "node_internals.h"
2625
#include "tracing/traced_value.h"
2726
#include "util-inl.h"
2827

Diff for: ‎src/cares_wrap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "async_wrap-inl.h"
2525
#include "env-inl.h"
2626
#include "node.h"
27-
#include "node_internals.h"
2827
#include "req_wrap-inl.h"
2928
#include "util-inl.h"
3029
#include "uv.h"

Diff for: ‎src/connection_wrap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "connect_wrap.h"
44
#include "env-inl.h"
55
#include "pipe_wrap.h"
6-
#include "node_internals.h"
76
#include "stream_base-inl.h"
87
#include "stream_wrap.h"
98
#include "tcp_wrap.h"

Diff for: ‎src/debug_utils.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "debug_utils.h"
2-
#include "node_internals.h"
32

43
#ifdef __POSIX__
54
#if defined(__linux__)

Diff for: ‎src/debug_utils.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include "async_wrap.h"
7-
#include "env.h"
8-
#include <string>
7+
#include "env-inl.h"
8+
99
#include <sstream>
10+
#include <string>
1011

1112
// Use FORCE_INLINE on functions that have a debug-category-enabled check first
1213
// and then ideally only a single function call following it, to maintain

Diff for: ‎src/fs_event_wrap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "env-inl.h"
2424
#include "util-inl.h"
2525
#include "node.h"
26-
#include "node_internals.h"
2726
#include "handle_wrap.h"
2827
#include "string_bytes.h"
2928

Diff for: ‎src/heap_utils.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include "node_internals.h"
2-
#include "env.h"
1+
#include "env-inl.h"
32

43
using v8::Array;
54
using v8::Boolean;

Diff for: ‎src/inspector_js_api.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "base_object-inl.h"
22
#include "inspector_agent.h"
33
#include "inspector_io.h"
4-
#include "node_internals.h"
54
#include "v8.h"
65
#include "v8-inspector.h"
76

Diff for: ‎src/js_stream.cc

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "env-inl.h"
55
#include "node_buffer.h"
66
#include "node_errors.h"
7-
#include "node_internals.h"
87
#include "stream_base-inl.h"
98
#include "v8.h"
109

Diff for: ‎src/module_wrap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "node_errors.h"
88
#include "node_url.h"
99
#include "util-inl.h"
10-
#include "node_internals.h"
1110
#include "node_contextify.h"
1211
#include "node_watchdog.h"
1312

Diff for: ‎src/node_binding.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "node_binding.h"
2-
#include "node_internals.h"
2+
#include "env-inl.h"
33
#include "node_native_module.h"
4+
#include "util.h"
45

56
#if HAVE_OPENSSL
67
#define NODE_BUILTIN_OPENSSL_MODULES(V) V(crypto) V(tls_wrap)

Diff for: ‎src/node_buffer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node.h"
2322
#include "node_buffer.h"
23+
#include "node.h"
2424
#include "node_errors.h"
25+
#include "node_internals.h"
2526

2627
#include "env-inl.h"
2728
#include "string_bytes.h"

Diff for: ‎src/node_contextify.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "base_object-inl.h"
77
#include "node_context_data.h"
88
#include "node_errors.h"
9-
#include "node_internals.h"
109

1110
namespace node {
1211
namespace contextify {

Diff for: ‎src/node_crypto.cc

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "node_crypto_clienthello-inl.h"
2828
#include "node_crypto_groups.h"
2929
#include "node_errors.h"
30-
#include "node_internals.h"
3130
#include "node_mutex.h"
3231
#include "node_process.h"
3332
#include "tls_wrap.h" // TLSWrap

Diff for: ‎src/node_domain.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
#include "env-inl.h"
12
#include "v8.h"
2-
#include "node_internals.h"
33

44
namespace node {
55
namespace domain {

Diff for: ‎src/node_dtrace.cc

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#endif
4444

4545
#include "node_errors.h"
46-
#include "node_internals.h"
4746

4847
#include <string.h>
4948

Diff for: ‎src/node_dtrace.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "node_internals.h"
27+
#include "env.h"
28+
#include "v8.h"
2829

2930
extern "C" {
3031
/*

Diff for: ‎src/node_env_var.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "node_errors.h"
2-
#include "node_internals.h"
32
#include "node_process.h"
3+
#include "util.h"
44

55
#ifdef __APPLE__
66
#include <crt_externs.h>

Diff for: ‎src/node_file.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "node_file.h"
2323
#include "aliased_buffer.h"
2424
#include "node_buffer.h"
25-
#include "node_internals.h"
2625
#include "node_process.h"
2726
#include "node_stat_watcher.h"
27+
#include "util.h"
2828

2929
#include "tracing/trace_event.h"
3030

Diff for: ‎src/node_http2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "node_buffer.h"
55
#include "node_http2.h"
66
#include "node_http2_state.h"
7-
#include "node_internals.h"
87
#include "node_perf.h"
8+
#include "util.h"
99

1010
#include <algorithm>
1111

Diff for: ‎src/node_http2.h

+3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
// FIXME(joyeecheung): nghttp2.h needs stdint.h to compile on Windows
7+
#include <stdint.h>
68
#include "nghttp2/nghttp2.h"
9+
710
#include "node_http2_state.h"
811
#include "node_perf.h"
912
#include "stream_base-inl.h"

Diff for: ‎src/node_http_parser_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "node.h"
2929
#include "node_buffer.h"
30-
#include "node_internals.h"
30+
#include "util.h"
3131

3232
#include "async_wrap-inl.h"
3333
#include "env-inl.h"

Diff for: ‎src/node_i18n.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@
4444

4545
#if defined(NODE_HAVE_I18N_SUPPORT)
4646

47+
#include "base_object-inl.h"
48+
#include "env-inl.h"
4749
#include "node.h"
4850
#include "node_buffer.h"
4951
#include "node_errors.h"
50-
#include "env-inl.h"
52+
#include "node_internals.h"
5153
#include "util-inl.h"
52-
#include "base_object-inl.h"
5354
#include "v8.h"
5455

5556
#include <unicode/utypes.h>

Diff for: ‎src/node_i18n.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "node_internals.h"
27+
#include "util.h"
28+
2829
#include <string>
2930

3031
#if defined(NODE_HAVE_I18N_SUPPORT)

Diff for: ‎src/node_internals.h

-100
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,9 @@
4444
#define Z_MIN_WINDOWBITS 8
4545
#define Z_MAX_WINDOWBITS 15
4646
#define Z_DEFAULT_WINDOWBITS 15
47-
// Fewer than 64 bytes per chunk is not recommended.
48-
// Technically it could work with as few as 8, but even 64 bytes
49-
// is low. Usually a MB or more is best.
50-
#define Z_MIN_CHUNK 64
51-
#define Z_MAX_CHUNK std::numeric_limits<double>::infinity()
52-
#define Z_DEFAULT_CHUNK (16 * 1024)
53-
#define Z_MIN_MEMLEVEL 1
54-
#define Z_MAX_MEMLEVEL 9
55-
#define Z_DEFAULT_MEMLEVEL 8
56-
#define Z_MIN_LEVEL -1
57-
#define Z_MAX_LEVEL 9
58-
#define Z_DEFAULT_LEVEL Z_DEFAULT_COMPRESSION
5947

6048
struct sockaddr;
6149

62-
// Variation on NODE_DEFINE_CONSTANT that sets a String value.
63-
#define NODE_DEFINE_STRING_CONSTANT(target, name, constant) \
64-
do { \
65-
v8::Isolate* isolate = target->GetIsolate(); \
66-
v8::Local<v8::String> constant_name = \
67-
v8::String::NewFromUtf8(isolate, name, v8::NewStringType::kNormal) \
68-
.ToLocalChecked(); \
69-
v8::Local<v8::String> constant_value = \
70-
v8::String::NewFromUtf8(isolate, constant, v8::NewStringType::kNormal)\
71-
.ToLocalChecked(); \
72-
v8::PropertyAttribute constant_attributes = \
73-
static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete); \
74-
target->DefineOwnProperty(isolate->GetCurrentContext(), \
75-
constant_name, \
76-
constant_value, \
77-
constant_attributes).FromJust(); \
78-
} while (0)
79-
8050
namespace node {
8151

8252
namespace native_module {
@@ -126,80 +96,10 @@ void RegisterSignalHandler(int signal,
12696
std::string GetHumanReadableProcessName();
12797
void GetHumanReadableProcessName(char (*name)[1024]);
12898

129-
template <typename T, size_t N>
130-
constexpr size_t arraysize(const T(&)[N]) { return N; }
131-
132-
#ifndef ROUND_UP
133-
# define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
134-
#endif
135-
136-
#ifdef __GNUC__
137-
# define MUST_USE_RESULT __attribute__((warn_unused_result))
138-
#else
139-
# define MUST_USE_RESULT
140-
#endif
141-
142-
class SlicedArguments {
143-
public:
144-
inline explicit SlicedArguments(
145-
const v8::FunctionCallbackInfo<v8::Value>& args,
146-
size_t start = 0);
147-
inline size_t size() const { return size_; }
148-
inline v8::Local<v8::Value>* data() { return data_; }
149-
150-
private:
151-
size_t size_;
152-
v8::Local<v8::Value>* data_;
153-
v8::Local<v8::Value> fixed_[64];
154-
std::vector<v8::Local<v8::Value>> dynamic_;
155-
};
156-
157-
SlicedArguments::SlicedArguments(
158-
const v8::FunctionCallbackInfo<v8::Value>& args,
159-
size_t start) : size_(0), data_(fixed_) {
160-
const size_t length = static_cast<size_t>(args.Length());
161-
if (start >= length) return;
162-
const size_t size = length - start;
163-
164-
if (size > arraysize(fixed_)) {
165-
dynamic_.resize(size);
166-
data_ = dynamic_.data();
167-
}
168-
169-
for (size_t i = 0; i < size; ++i)
170-
data_[i] = args[i + start];
171-
172-
size_ = size;
173-
}
174-
17599
namespace task_queue {
176100
void PromiseRejectCallback(v8::PromiseRejectMessage message);
177101
} // namespace task_queue
178102

179-
enum Endianness {
180-
kLittleEndian, // _Not_ LITTLE_ENDIAN, clashes with endian.h.
181-
kBigEndian
182-
};
183-
184-
inline enum Endianness GetEndianness() {
185-
// Constant-folded by the compiler.
186-
const union {
187-
uint8_t u8[2];
188-
uint16_t u16;
189-
} u = {
190-
{ 1, 0 }
191-
};
192-
return u.u16 == 1 ? kLittleEndian : kBigEndian;
193-
}
194-
195-
inline bool IsLittleEndian() {
196-
return GetEndianness() == kLittleEndian;
197-
}
198-
199-
inline bool IsBigEndian() {
200-
return GetEndianness() == kBigEndian;
201-
}
202-
203103
class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
204104
public:
205105
inline uint32_t* zero_fill_field() { return &zero_fill_field_; }

Diff for: ‎src/node_messaging.cc

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "debug_utils.h"
55
#include "node_buffer.h"
66
#include "node_errors.h"
7-
#include "node_internals.h"
87
#include "node_process.h"
98
#include "util-inl.h"
109
#include "util.h"

Diff for: ‎src/node_native_module.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "node_native_module.h"
22
#include "node_errors.h"
3-
#include "node_internals.h"
43

54
namespace node {
65

Diff for: ‎src/node_options.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <errno.h>
2-
#include "node_internals.h"
2+
#include "env-inl.h"
3+
#include "node_binding.h"
34
#include "node_options-inl.h"
45

56
using v8::Boolean;

Diff for: ‎src/node_os.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node_internals.h"
22+
#include "env-inl.h"
2323
#include "string_bytes.h"
24+
#include "util.h"
2425

2526
#include <array>
2627
#include <errno.h>

Diff for: ‎src/node_perf.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include "node.h"
7-
#include "node_internals.h"
87
#include "node_perf_common.h"
98
#include "env.h"
109
#include "base_object-inl.h"

Diff for: ‎src/node_perf_common.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include "node.h"
7+
#include "uv.h"
78
#include "v8.h"
89

910
#include <algorithm>

0 commit comments

Comments
 (0)