summaryrefslogtreecommitdiff
path: root/src/async_wrap.h
diff options
context:
space:
mode:
authorGerhard Stoebich <18708370+Flarna@users.noreply.github.com>2019-04-23 00:57:12 +0200
committerAnna Henningsen <anna@addaleax.net>2019-05-03 16:02:55 +0200
commit8876ac5c358114f0f88424f6737ca4b89fc9e6c7 (patch)
tree5b0804517e873f3c08b236104b11f26dd752f941 /src/async_wrap.h
parent8dae89b396df64e6a9e44cb94efe27809a5a3d89 (diff)
downloadandroid-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.tar.gz
android-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.tar.bz2
android-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.zip
async_hooks: fixup do not reuse HTTPParser
Fix some issues introduced/not fixed via https://github.com/nodejs/node/pull/25094: * Init hook is not emitted for a reused HTTPParser * HTTPParser was still used as resource in init hook * type used in init hook was always HTTPINCOMINGMESSAGE even for client requests * some tests have not been adapted to new resource names With this change the async hooks init event is emitted during a call to Initialize() as the type and resource object is available at this time. As a result Initialize() must be called now which could be seen as breaking change even HTTPParser is not part of documented API. It was needed to put the ClientRequest instance into a wrapper object instead passing it directly as async resource otherwise test-domain-multi fails. I think this is because adding an EventEmitter to a Domain adds a property 'domain' and the presence of this changes the context propagation in domains. Besides that tests still refering to resource HTTPParser have been updated/improved. Fixes: https://github.com/nodejs/node/issues/27467 Fixes: https://github.com/nodejs/node/issues/26961 Refs: https://github.com/nodejs/node/pull/25094 PR-URL: https://github.com/nodejs/node/pull/27477 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'src/async_wrap.h')
-rw-r--r--src/async_wrap.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/async_wrap.h b/src/async_wrap.h
index bcd37bb0c0..20134f4a7b 100644
--- a/src/async_wrap.h
+++ b/src/async_wrap.h
@@ -109,12 +109,18 @@ class AsyncWrap : public BaseObject {
AsyncWrap(Environment* env,
v8::Local<v8::Object> object,
ProviderType provider,
- double execution_async_id = -1);
+ double execution_async_id = kInvalidAsyncId);
+
+ // This constructor creates a reuseable instance where user is responsible
+ // to call set_provider_type() and AsyncReset() before use.
+ AsyncWrap(Environment* env, v8::Local<v8::Object> object);
~AsyncWrap() override;
AsyncWrap() = delete;
+ static constexpr double kInvalidAsyncId = -1;
+
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
Environment* env);
@@ -141,6 +147,8 @@ class AsyncWrap : public BaseObject {
static void EmitAfter(Environment* env, double async_id);
static void EmitPromiseResolve(Environment* env, double async_id);
+ void EmitDestroy();
+
void EmitTraceEventBefore();
static void EmitTraceEventAfter(ProviderType type, double async_id);
void EmitTraceEventDestroy();
@@ -155,10 +163,11 @@ class AsyncWrap : public BaseObject {
inline double get_trigger_async_id() const;
void AsyncReset(v8::Local<v8::Object> resource,
- double execution_async_id = -1,
+ double execution_async_id = kInvalidAsyncId,
bool silent = false);
- void AsyncReset(double execution_async_id = -1, bool silent = false);
+ void AsyncReset(double execution_async_id = kInvalidAsyncId,
+ bool silent = false);
// Only call these within a valid HandleScope.
v8::MaybeLocal<v8::Value> MakeCallback(const v8::Local<v8::Function> cb,
@@ -210,7 +219,7 @@ class AsyncWrap : public BaseObject {
bool silent);
ProviderType provider_type_;
// Because the values may be Reset(), cannot be made const.
- double async_id_ = -1;
+ double async_id_ = kInvalidAsyncId;
double trigger_async_id_;
};