Hi @legendecas , can you elaborate some more on the problem introduced in 853? Maybe we can discuss in today's call.

EDIT: Ah, I see it now:

Lines 6010 to 6013 in e439222

    
           template<class T> 
        
           inline void AsyncProgressQueueWorker<T>::ExecutionProgress::Signal() const { 
        
             _worker->Signal(); 
        
           }

node-addon-api/napi-inl.h

Lines 5999 to 6002 in e439222

    
           template<class T> 
        
           inline void AsyncProgressQueueWorker<T>::Signal() const { 
        
             this->NonBlockingCall(nullptr); 
        
           }

node-addon-api/napi-inl.h

Lines 5736 to 5740 in e439222

    
           template <typename DataType> 
        
           inline napi_status AsyncProgressWorkerBase<DataType>::NonBlockingCall(DataType* data) { 
        
             auto tsd = new AsyncProgressWorkerBase::ThreadSafeData(this, data); 
        
             return _tsfn.NonBlockingCall(tsd, OnAsyncWorkProgress); 
        
           }

node-addon-api/napi-inl.h

Lines 5727 to 5734 in e439222

    
           template <typename DataType> 
        
           inline void AsyncProgressWorkerBase<DataType>::OnAsyncWorkProgress(Napi::Env /* env */, 
        
                                           Napi::Function /* jsCallback */, 
        
                                           void* data) { 
        
             ThreadSafeData* tsd = static_cast<ThreadSafeData*>(data); 
        
             tsd->asyncprogressworker()->OnWorkProgress(tsd->data()); 
        
             delete tsd; 
        
           }

node-addon-api/napi-inl.h

Lines 5976 to 5981 in e439222

    
           template<class T> 
        
           inline void AsyncProgressQueueWorker<T>::OnWorkProgress(std::pair<T*, size_t>* datapair) { 
        
             if (datapair == nullptr) { 
        
               return; 
        
             }

I have been able to resolve via:

@@ -5986,7 +5990,8 @@ inline void AsyncProgressQueueWorker<T>::SendProgress_(const T* data, size_t cou
 
 template<class T>
 inline void AsyncProgressQueueWorker<T>::Signal() {
-  this->NonBlockingCall(nullptr);
+  auto pair = new std::pair<T*, size_t>(nullptr, 0);
+  this->NonBlockingCall(pair);
 }

If this is the correct implementation, I can create a PR. Let's discuss in today's call.

	template<class T>
	inline void AsyncProgressQueueWorker<T>::ExecutionProgress::Signal() const {
	_worker->Signal();
	}

	template<class T>
	inline void AsyncProgressQueueWorker<T>::Signal() const {
	this->NonBlockingCall(nullptr);
	}

	template <typename DataType>
	inline napi_status AsyncProgressWorkerBase<DataType>::NonBlockingCall(DataType* data) {
	auto tsd = new AsyncProgressWorkerBase::ThreadSafeData(this, data);
	return _tsfn.NonBlockingCall(tsd, OnAsyncWorkProgress);
	}

	template <typename DataType>
	inline void AsyncProgressWorkerBase<DataType>::OnAsyncWorkProgress(Napi::Env /* env */,
	Napi::Function /* jsCallback */,
	void* data) {
	ThreadSafeData* tsd = static_cast<ThreadSafeData*>(data);
	tsd->asyncprogressworker()->OnWorkProgress(tsd->data());
	delete tsd;
	}

	template<class T>
	inline void AsyncProgressQueueWorker<T>::OnWorkProgress(std::pair<T, size_t> datapair) {
	if (datapair == nullptr) {
	return;
	}

Uh oh!

AsyncProgressQueueWorker::Signal() does not trigger the TSFN #1095

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions