Fixes Solenoid Memory Leak

HAL ports can be freed after solenoid port is created
robotdotnet · Feb 5, 2016 · 3b2975a · 3b2975a
1 parent 06bbdc1
commit 3b2975a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/WPILib/DoubleSolenoid.cs b/WPILib/DoubleSolenoid.cs
@@ -58,11 +58,11 @@ private void InitSolenoid()
                 IntPtr port = GetPortWithModule((byte)ModuleNumber, (byte)m_forwardChannel);
                 m_forwardSolenoid = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
-
+                FreePort(port);
                 port = GetPortWithModule((byte)ModuleNumber, (byte)m_reverseChannel);
                 m_reverseSolenoid = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
-
+                FreePort(port);
                 HAL.Base.HAL.Report(ResourceType.kResourceType_Solenoid, (byte)m_forwardChannel, (byte)(ModuleNumber));
                 HAL.Base.HAL.Report(ResourceType.kResourceType_Solenoid, (byte)m_reverseChannel, (byte)(ModuleNumber));
                 LiveWindow.LiveWindow.AddActuator("DoubleSolenoid", ModuleNumber, m_forwardChannel, this);

diff --git a/WPILib/Solenoid.cs b/WPILib/Solenoid.cs
@@ -40,6 +40,7 @@ private void InitSolenoid()
                 IntPtr port = GetPortWithModule((byte)ModuleNumber, (byte)m_channel);
                 m_solenoidPort = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
+                FreePort(port);
                 LiveWindow.LiveWindow.AddActuator("Solenoid", ModuleNumber, m_channel, this);
                 Report(ResourceType.kResourceType_Solenoid, (byte)m_channel, (byte)ModuleNumber);
             }

diff --git a/WPILib/SolenoidBase.cs b/WPILib/SolenoidBase.cs
@@ -33,8 +33,10 @@ protected SolenoidBase(int moduleNumber)
             {
                 ModuleNumber = moduleNumber;
                 int status = 0;
-                m_port = InitializeSolenoidPort(GetPortWithModule((byte) ModuleNumber, 0), ref status);
+                IntPtr port = GetPortWithModule((byte)ModuleNumber, 0);
+                m_port = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
+                FreePort(port);
             }
         }