Revert "async_hooks: merge resource_symbol with owner_symbol"

This reverts commit 7ca2f13.
PR-URL: #40741Fixes: #40693
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: RaisinTen

lib/_http_agent.js

@@ -525,7 +525,7 @@ function asyncResetHandle(socket) {
 consthandle=socket._handle;
 if(handle&&typeofhandle.asyncReset==='function'){
 // Assign the handle a new asyncId and run any destroy()/init() hooks.
-handle.asyncReset(newReusedHandle(handle.getProviderType(),socket));
+handle.asyncReset(newReusedHandle(handle.getProviderType(),handle));
 socket[async_id_symbol]=handle.getAsyncId();
 }
 }

lib/internal/async_hooks.js

@@ -81,7 +81,7 @@ const active_hooks = {
 
 const{ registerDestroyHook }=async_wrap;
 const{ enqueueMicrotask }=internalBinding('task_queue');
-const{ owner_symbol }=internalBinding('symbols');
+const{resource_symbol,owner_symbol }=internalBinding('symbols');
 
 // Each constant tracks how many callbacks there are for any given step of
 // async execution. These are tracked so if the user didn't include callbacks
@@ -176,13 +176,11 @@ function fatalError(e) {
 
 functionlookupPublicResource(resource){
 if(typeofresource!=='object'||resource===null)returnresource;
-
-constpublicResource=resource[owner_symbol];
-
-if(publicResource!=null){
+// TODO(addaleax): Merge this with owner_symbol and use it across all
+// AsyncWrap instances.
+constpublicResource=resource[resource_symbol];
+if(publicResource!==undefined)
 returnpublicResource;
-}
-
 returnresource;
 }
 

lib/internal/js_stream_socket.js

@@ -22,55 +22,15 @@ const kCurrentWriteRequest = Symbol('kCurrentWriteRequest');
 constkCurrentShutdownRequest=Symbol('kCurrentShutdownRequest');
 constkPendingShutdownRequest=Symbol('kPendingShutdownRequest');
 
-functionisClosing(){
-letsocket=this[owner_symbol];
+functionisClosing(){returnthis[owner_symbol].isClosing();}
 
-if(socket.constructor.name==='ReusedHandle'){
-socket=socket.handle;
-}
-
-returnsocket.isClosing();
-}
-
-functiononreadstart(){
-letsocket=this[owner_symbol];
-
-if(socket.constructor.name==='ReusedHandle'){
-socket=socket.handle;
-}
-
-returnsocket.readStart();
-}
-
-functiononreadstop(){
-letsocket=this[owner_symbol];
-
-if(socket.constructor.name==='ReusedHandle'){
-socket=socket.handle;
-}
-
-returnsocket.readStop();
-}
-
-functiononshutdown(req){
-letsocket=this[owner_symbol];
-
-if(socket.constructor.name==='ReusedHandle'){
-socket=socket.handle;
-}
+functiononreadstart(){returnthis[owner_symbol].readStart();}
 
-returnsocket.doShutdown(req);
-}
+functiononreadstop(){returnthis[owner_symbol].readStop();}
 
-functiononwrite(req,bufs){
-letsocket=this[owner_symbol];
+functiononshutdown(req){returnthis[owner_symbol].doShutdown(req);}
 
-if(socket.constructor.name==='ReusedHandle'){
-socket=socket.handle;
-}
-
-returnsocket.doWrite(req,bufs);
-}
+functiononwrite(req,bufs){returnthis[owner_symbol].doWrite(req,bufs);}
 
 /* This class serves as a wrapper for when the C++ side of Node wants access
  * to a standard JS stream. For example, TLS or HTTP do not operate on network

lib/internal/stream_base_commons.js

@@ -80,11 +80,7 @@ function handleWriteReq(req, data, encoding) {
 functiononWriteComplete(status){
 debug('onWriteComplete',status,this.error);
 
-letstream=this.handle[owner_symbol];
-
-if(stream.constructor.name==='ReusedHandle'){
-stream=stream.handle;
-}
+conststream=this.handle[owner_symbol];
 
 if(stream.destroyed){
 if(typeofthis.callback==='function')
@@ -172,12 +168,7 @@ function onStreamRead(arrayBuffer) {
 constnread=streamBaseState[kReadBytesOrError];
 
 consthandle=this;
-
-letstream=this[owner_symbol];
-
-if(stream.constructor.name==='ReusedHandle'){
-stream=stream.handle;
-}
+conststream=this[owner_symbol];
 
 stream[kUpdateTimer]();
 

lib/net.js

@@ -1117,11 +1117,7 @@ Socket.prototype.unref = function() {
 
 
 functionafterConnect(status,handle,req,readable,writable){
-letself=handle[owner_symbol];
-
-if(self.constructor.name==='ReusedHandle'){
-self=self.handle;
-}
+constself=handle[owner_symbol];
 
 // Callback may come after call to destroy
 if(self.destroyed){

src/async_wrap.cc

@@ -313,7 +313,7 @@ void AsyncWrap::EmitDestroy(bool from_gc) {
 
 if (!persistent().IsEmpty() && !from_gc) {
  HandleScope handle_scope(env()->isolate());
-USE(object()->Set(env()->context(), env()->owner_symbol(), object()));
+USE(object()->Set(env()->context(), env()->resource_symbol(), object()));
  }
 }
 
@@ -589,7 +589,7 @@ void AsyncWrap::AsyncReset(Local<Object> resource, double execution_async_id,
  Local<Object> obj = object();
 CHECK(!obj.IsEmpty());
 if (resource != obj) {
-USE(obj->Set(env()->context(), env()->owner_symbol(), resource));
+USE(obj->Set(env()->context(), env()->resource_symbol(), resource));
  }
  }
 

src/env.h

@@ -171,6 +171,7 @@ constexpr size_t kFsStatsBufferLength =
 V(oninit_symbol, "oninit") \
 V(owner_symbol, "owner_symbol") \
 V(onpskexchange_symbol, "onpskexchange") \
+V(resource_symbol, "resource_symbol") \
 V(trigger_async_id_symbol, "trigger_async_id_symbol") \
 
 // Strings are per-isolate primitives but Environment proxies them

test/async-hooks/test-http-agent-handle-reuse-parallel.js

@@ -87,4 +87,6 @@ function onExit() {
 // Verify reuse handle has been wrapped
 assert.strictEqual(first.type,second.type);
 assert.ok(first.handle!==second.handle,'Resource reused');
+assert.ok(first.handle===second.handle.handle,
+'Resource not wrapped correctly');
 }

test/async-hooks/test-http-agent-handle-reuse-serial.js

@@ -105,4 +105,6 @@ function onExit() {
 // Verify reuse handle has been wrapped
 assert.strictEqual(first.type,second.type);
 assert.ok(first.handle!==second.handle,'Resource reused');
+assert.ok(first.handle===second.handle.handle,
+'Resource not wrapped correctly');
 }