Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sim] WebSockets: don't override HAL_Main

Browse Source 
Also clean up some other implementation aspects for cleaner shutdown and
reduce peak memory allocation.
This commit is contained in:
Peter Johnson
2020-09-04 10:57:05 -07:00
parent f1b1bdb121
commit f86a5f9b09
19 changed files with 780 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
View File

@@ -166,8 +166,7 @@ void HALSimWSProviderSimDevices::DeviceFreedCallback(
m_providers.Delete(name);
}
void HALSimWSProviderSimDevices::Initialize(
std::shared_ptr<wpi::uv::Loop> loop) {
void HALSimWSProviderSimDevices::Initialize(wpi::uv::Loop& loop) {
m_deviceCreatedCbKey = HALSIM_RegisterSimDeviceCreatedCallback(
"", this, HALSimWSProviderSimDevices::DeviceCreatedCallbackStatic, 1);
m_deviceFreedCbKey = HALSIM_RegisterSimDeviceFreedCallback(

2
simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h
View File

@@ -90,7 +90,7 @@ class HALSimWSProviderSimDevices {
: m_providers(providers) {}
~HALSimWSProviderSimDevices();
void Initialize(std::shared_ptr<wpi::uv::Loop> loop);
void Initialize(wpi::uv::Loop& loop);
void OnNetworkConnected(std::shared_ptr<HALSimBaseWebSocketConnection> hws);
void OnNetworkDisconnected();