From 6a1e5385e596aba1d5c5d727747834a641b7d47e Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Mon, 31 Aug 2020 22:14:37 -0700
Subject: [PATCH] [sim] WS: Don't call virtual function from destructor

---
 .../src/main/native/cpp/WSProvider_Analog.cpp             | 6 ++++--
 .../halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp | 6 ++++--
 .../src/main/native/cpp/WSProvider_DriverStation.cpp      | 6 ++++--
 .../src/main/native/cpp/WSProvider_Encoder.cpp            | 6 ++++--
 .../src/main/native/cpp/WSProvider_Joystick.cpp           | 6 ++++--
 .../halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp | 6 ++++--
 .../src/main/native/cpp/WSProvider_Relay.cpp              | 6 ++++--
 .../src/main/native/cpp/WSProvider_RoboRIO.cpp            | 6 ++++--
 .../src/main/native/cpp/WSProvider_dPWM.cpp               | 8 ++++++--
 .../src/main/native/include/WSProvider_Analog.h           | 2 ++
 .../src/main/native/include/WSProvider_DIO.h              | 1 +
 .../src/main/native/include/WSProvider_DriverStation.h    | 1 +
 .../src/main/native/include/WSProvider_Encoder.h          | 1 +
 .../src/main/native/include/WSProvider_Joystick.h         | 1 +
 .../src/main/native/include/WSProvider_PWM.h              | 1 +
 .../src/main/native/include/WSProvider_Relay.h            | 1 +
 .../src/main/native/include/WSProvider_RoboRIO.h          | 1 +
 .../src/main/native/include/WSProvider_dPWM.h             | 1 +
 18 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.cpp
index 280ce5e4f1..91a8fa99ab 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.cpp
@@ -45,7 +45,7 @@ void HALSimWSProviderAnalogIn::Initialize(WSRegisterFunc webRegisterFunc) {
                                             webRegisterFunc);
 }
 
-HALSimWSProviderAnalogIn::~HALSimWSProviderAnalogIn() { CancelCallbacks(); }
+HALSimWSProviderAnalogIn::~HALSimWSProviderAnalogIn() { DoCancelCallbacks(); }
 
 void HALSimWSProviderAnalogIn::RegisterCallbacks() {
   m_initCbKey = REGISTER_AIN(Initialized, "<init", bool, boolean);
@@ -66,7 +66,9 @@ void HALSimWSProviderAnalogIn::RegisterCallbacks() {
       REGISTER_AIN_ACCUM(Deadband, "<accum_deadband", int32_t, int);
 }
 
-void HALSimWSProviderAnalogIn::CancelCallbacks() {
+void HALSimWSProviderAnalogIn::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderAnalogIn::DoCancelCallbacks() {
   // Cancel callbacks
   HALSIM_CancelAnalogInInitializedCallback(m_channel, m_initCbKey);
   HALSIM_CancelAnalogInAverageBitsCallback(m_channel, m_avgbitsCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp
index 82d823dae2..88fb29fb3d 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp
@@ -26,7 +26,7 @@ void HALSimWSProviderDIO::Initialize(WSRegisterFunc webRegisterFunc) {
                                        webRegisterFunc);
 }
 
-HALSimWSProviderDIO::~HALSimWSProviderDIO() { CancelCallbacks(); }
+HALSimWSProviderDIO::~HALSimWSProviderDIO() { DoCancelCallbacks(); }
 
 void HALSimWSProviderDIO::RegisterCallbacks() {
   m_initCbKey = REGISTER(Initialized, "<init", bool, boolean);
@@ -35,7 +35,9 @@ void HALSimWSProviderDIO::RegisterCallbacks() {
   m_inputCbKey = REGISTER(IsInput, "<input", bool, boolean);
 }
 
-void HALSimWSProviderDIO::CancelCallbacks() {
+void HALSimWSProviderDIO::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderDIO::DoCancelCallbacks() {
   HALSIM_CancelDIOInitializedCallback(m_channel, m_initCbKey);
   HALSIM_CancelDIOValueCallback(m_channel, m_valueCbKey);
   HALSIM_CancelDIOPulseLengthCallback(m_channel, m_pulseLengthCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
index 93aafdf91c..b7725ea310 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
@@ -31,7 +31,7 @@ void HALSimWSProviderDriverStation::Initialize(WSRegisterFunc webRegisterFunc) {
 }
 
 HALSimWSProviderDriverStation::~HALSimWSProviderDriverStation() {
-  CancelCallbacks();
+  DoCancelCallbacks();
 }
 
 void HALSimWSProviderDriverStation::RegisterCallbacks() {
@@ -81,7 +81,9 @@ void HALSimWSProviderDriverStation::RegisterCallbacks() {
   m_matchTimeCbKey = REGISTER(MatchTime, "<match_time", double, double);
 }
 
-void HALSimWSProviderDriverStation::CancelCallbacks() {
+void HALSimWSProviderDriverStation::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderDriverStation::DoCancelCallbacks() {
   HALSIM_CancelDriverStationEnabledCallback(m_enabledCbKey);
   HALSIM_CancelDriverStationAutonomousCallback(m_autonomousCbKey);
   HALSIM_CancelDriverStationTestCallback(m_testCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.cpp
index 1a529f2a53..58d47d06a2 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.cpp
@@ -26,7 +26,7 @@ void HALSimWSProviderEncoder::Initialize(WSRegisterFunc webRegisterFunc) {
                                            webRegisterFunc);
 }
 
-HALSimWSProviderEncoder::~HALSimWSProviderEncoder() { CancelCallbacks(); }
+HALSimWSProviderEncoder::~HALSimWSProviderEncoder() { DoCancelCallbacks(); }
 
 void HALSimWSProviderEncoder::RegisterCallbacks() {
   // Special case for initialization since we will need to send
@@ -57,7 +57,9 @@ void HALSimWSProviderEncoder::RegisterCallbacks() {
   m_samplesCbKey = REGISTER(SamplesToAverage, "<samples_to_avg", int32_t, int);
 }
 
-void HALSimWSProviderEncoder::CancelCallbacks() {
+void HALSimWSProviderEncoder::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderEncoder::DoCancelCallbacks() {
   HALSIM_CancelEncoderInitializedCallback(m_channel, m_initCbKey);
   HALSIM_CancelEncoderCountCallback(m_channel, m_countCbKey);
   HALSIM_CancelEncoderPeriodCallback(m_channel, m_periodCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp
index b1f17a2f2c..d43b234a06 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp
@@ -17,7 +17,7 @@ void HALSimWSProviderJoystick::Initialize(WSRegisterFunc webregisterFunc) {
                                             webregisterFunc);
 }
 
-HALSimWSProviderJoystick::~HALSimWSProviderJoystick() { CancelCallbacks(); }
+HALSimWSProviderJoystick::~HALSimWSProviderJoystick() { DoCancelCallbacks(); }
 
 void HALSimWSProviderJoystick::RegisterCallbacks() {
   m_dsNewDataCbKey = HALSIM_RegisterDriverStationNewDataCallback(
@@ -62,7 +62,9 @@ void HALSimWSProviderJoystick::RegisterCallbacks() {
       this, true);
 }
 
-void HALSimWSProviderJoystick::CancelCallbacks() {
+void HALSimWSProviderJoystick::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderJoystick::DoCancelCallbacks() {
   HALSIM_CancelDriverStationNewDataCallback(m_dsNewDataCbKey);
 
   m_dsNewDataCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp
index 8b790c1e02..cd0f4f4907 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp
@@ -25,7 +25,7 @@ void HALSimWSProviderPWM::Initialize(WSRegisterFunc webRegisterFunc) {
                                        webRegisterFunc);
 }
 
-HALSimWSProviderPWM::~HALSimWSProviderPWM() { CancelCallbacks(); }
+HALSimWSProviderPWM::~HALSimWSProviderPWM() { DoCancelCallbacks(); }
 
 void HALSimWSProviderPWM::RegisterCallbacks() {
   m_initCbKey = REGISTER(Initialized, "<init", bool, boolean);
@@ -36,7 +36,9 @@ void HALSimWSProviderPWM::RegisterCallbacks() {
   m_zeroLatchCbKey = REGISTER(ZeroLatch, "<zero_latch", bool, boolean);
 }
 
-void HALSimWSProviderPWM::CancelCallbacks() {
+void HALSimWSProviderPWM::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderPWM::DoCancelCallbacks() {
   HALSIM_CancelPWMInitializedCallback(m_channel, m_initCbKey);
   HALSIM_CancelPWMSpeedCallback(m_channel, m_speedCbKey);
   HALSIM_CancelPWMPositionCallback(m_channel, m_positionCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Relay.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Relay.cpp
index bbc445d7b2..e51658f134 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Relay.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Relay.cpp
@@ -25,7 +25,7 @@ void HALSimWSProviderRelay::Initialize(WSRegisterFunc webRegisterFunc) {
                                          webRegisterFunc);
 }
 
-HALSimWSProviderRelay::~HALSimWSProviderRelay() { CancelCallbacks(); }
+HALSimWSProviderRelay::~HALSimWSProviderRelay() { DoCancelCallbacks(); }
 
 void HALSimWSProviderRelay::RegisterCallbacks() {
   m_initFwdCbKey = REGISTER(InitializedForward, "<init_fwd", bool, boolean);
@@ -34,7 +34,9 @@ void HALSimWSProviderRelay::RegisterCallbacks() {
   m_revCbKey = REGISTER(Reverse, "<rev", bool, boolean);
 }
 
-void HALSimWSProviderRelay::CancelCallbacks() {
+void HALSimWSProviderRelay::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderRelay::DoCancelCallbacks() {
   HALSIM_CancelRelayInitializedForwardCallback(m_channel, m_initFwdCbKey);
   HALSIM_CancelRelayInitializedReverseCallback(m_channel, m_initRevCbKey);
   HALSIM_CancelRelayForwardCallback(m_channel, m_fwdCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp
index 789fe71cd7..42e2cc8884 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp
@@ -24,7 +24,7 @@ void HALSimWSProviderRoboRIO::Initialize(WSRegisterFunc webRegisterFunc) {
   CreateSingleProvider<HALSimWSProviderRoboRIO>("RoboRIO", webRegisterFunc);
 }
 
-HALSimWSProviderRoboRIO::~HALSimWSProviderRoboRIO() { CancelCallbacks(); }
+HALSimWSProviderRoboRIO::~HALSimWSProviderRoboRIO() { DoCancelCallbacks(); }
 
 void HALSimWSProviderRoboRIO::RegisterCallbacks() {
   m_fpgaCbKey = REGISTER(FPGAButton, ">fpga_button", bool, boolean);
@@ -47,7 +47,9 @@ void HALSimWSProviderRoboRIO::RegisterCallbacks() {
   m_3v3FaultsCbKey = REGISTER(UserFaults3V3, ">3v3_faults", int32_t, int);
 }
 
-void HALSimWSProviderRoboRIO::CancelCallbacks() {
+void HALSimWSProviderRoboRIO::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderRoboRIO::DoCancelCallbacks() {
   HALSIM_CancelRoboRioFPGAButtonCallback(m_fpgaCbKey);
   HALSIM_CancelRoboRioVInVoltageCallback(m_vinVoltageCbKey);
   HALSIM_CancelRoboRioVInCurrentCallback(m_vinCurrentCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.cpp
index 881bb28f97..ce4fd79068 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.cpp
@@ -26,7 +26,9 @@ void HALSimWSProviderDigitalPWM::Initialize(WSRegisterFunc webRegisterFunc) {
       "dPWM", HAL_GetNumDigitalPWMOutputs(), webRegisterFunc);
 }
 
-HALSimWSProviderDigitalPWM::~HALSimWSProviderDigitalPWM() { CancelCallbacks(); }
+HALSimWSProviderDigitalPWM::~HALSimWSProviderDigitalPWM() {
+  DoCancelCallbacks();
+}
 
 void HALSimWSProviderDigitalPWM::RegisterCallbacks() {
   m_initCbKey = REGISTER(Initialized, "<init", bool, boolean);
@@ -34,7 +36,9 @@ void HALSimWSProviderDigitalPWM::RegisterCallbacks() {
   m_pinCbKey = REGISTER(Pin, "<dio_pin", int32_t, int);
 }
 
-void HALSimWSProviderDigitalPWM::CancelCallbacks() {
+void HALSimWSProviderDigitalPWM::CancelCallbacks() { DoCancelCallbacks(); }
+
+void HALSimWSProviderDigitalPWM::DoCancelCallbacks() {
   HALSIM_CancelDigitalPWMInitializedCallback(m_channel, m_initCbKey);
   HALSIM_CancelDigitalPWMDutyCycleCallback(m_channel, m_dutyCycleCbKey);
   HALSIM_CancelDigitalPWMPinCallback(m_channel, m_pinCbKey);
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h
index 2c59139043..8ebc235fcb 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h
@@ -25,6 +25,7 @@ class HALSimWSProviderAnalogIn : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;
@@ -48,6 +49,7 @@ class HALSimWSProviderAnalogOut : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h
index 7ada2f7eee..8d6da7eda0 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h
@@ -25,6 +25,7 @@ class HALSimWSProviderDIO : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h
index 7c8cb2bee3..c61419c4cc 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h
@@ -25,6 +25,7 @@ class HALSimWSProviderDriverStation : public HALSimWSHalProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_enabledCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h
index fe2a82dd05..882e447da6 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h
@@ -25,6 +25,7 @@ class HALSimWSProviderEncoder : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h
index 953e6be6db..4b06beea5e 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h
@@ -25,6 +25,7 @@ class HALSimWSProviderJoystick : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_dsNewDataCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h
index 9bce76f77a..19be17af5f 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h
@@ -23,6 +23,7 @@ class HALSimWSProviderPWM : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Relay.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Relay.h
index 0a7512a730..aa3f84f8fc 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Relay.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_Relay.h
@@ -23,6 +23,7 @@ class HALSimWSProviderRelay : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initFwdCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h
index fcd7a2e0f1..9ffc2ed9ee 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h
@@ -25,6 +25,7 @@ class HALSimWSProviderRoboRIO : public HALSimWSHalProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_fpgaCbKey = 0;
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h
index 78dc96c944..49b7000d20 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h
@@ -23,6 +23,7 @@ class HALSimWSProviderDigitalPWM : public HALSimWSHalChanProvider {
  protected:
   void RegisterCallbacks() override;
   void CancelCallbacks() override;
+  void DoCancelCallbacks();
 
  private:
   int32_t m_initCbKey = 0;