More race conditions for exit 128

Author: ktf

Framework/Core/src/DataProcessingDevice.cxx

@@ -982,6 +982,10 @@ void DataProcessingDevice::InitTask()
     uv_signal_init(state.loop, deviceContext.sigusr1Handle);
     uv_signal_start(deviceContext.sigusr1Handle, on_signal_callback, SIGUSR1);
   }
+  // If there is any signal, we want to make sure they are active
+  for (auto& handle : state.activeSignals) {
+    handle->data = &state;
+  }
   // When we start, we must make sure that we do listen to the signal
   deviceContext.sigusr1Handle->data = &mServiceRegistry;
 
@@ -1691,6 +1695,11 @@ void DataProcessingDevice::ResetTask()
   if (deviceContext.sigusr1Handle) {
     deviceContext.sigusr1Handle->data = nullptr;
   }
+  // Makes sure we do not have a working context on
+  // shutdown.
+  for (auto& handle : ref.get<DeviceState>().activeSignals) {
+    handle->data = nullptr;
+  }
 }
 
 struct WaitBackpressurePolicy {

Framework/Core/src/DeviceSpecHelpers.cxx

@@ -90,6 +90,9 @@ void signal_callback(uv_signal_t* handle, int)
 {
   // We simply wake up the event loop. Nothing to be done here.
   auto* state = (DeviceState*)handle->data;
+  if (!state) {
+    return;
+  }
   state->loopReason |= DeviceState::SIGNAL_ARRIVED;
   state->loopReason |= DeviceState::DATA_INCOMING;
 }