nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

mux: optimize many accesses to O(log(n)) vs Nintendo's O(log(n)^2)

Browse source
This commit is contained in:
Michael Scire 2021-02-09 07:51:02 -08:00 committed by SciresM
parent 4cb6c63516
commit 00ab210e66
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/source/htc/server/driver/htc_htclow_driver.cpp
View file

@ -31,7 +31,7 @@ namespace ams::htc::server::driver {
} }
void HtclowDriver::WaitTask(u32 task_id) { void HtclowDriver::WaitTask(u32 task_id) {
os::WaitEvent(m_manager->GeTaskEvent(task_id)); os::WaitEvent(m_manager->GetTaskEvent(task_id));
} }
void HtclowDriver::SetDisconnectionEmulationEnabled(bool en) { void HtclowDriver::SetDisconnectionEmulationEnabled(bool en) {

16
libraries/libstratosphere/source/htclow/mux/htclow_mux.cpp
View file

@ -35,7 +35,7 @@ namespace ams::htclow::mux {
/* Set all entries in our map. */ /* Set all entries in our map. */
/* NOTE: Nintendo does this highly inefficiently... */ /* NOTE: Nintendo does this highly inefficiently... */
for (auto &pair : m_channel_impl_map.GetMap()) { for (auto &pair : m_channel_impl_map.GetMap()) {
m_channel_impl_map[pair.first].SetVersion(m_version); m_channel_impl_map[pair.second].SetVersion(m_version);
} }
} }
@ -67,10 +67,8 @@ namespace ams::htclow::mux {
std::scoped_lock lk(m_mutex); std::scoped_lock lk(m_mutex);
/* Process for the channel. */ /* Process for the channel. */
if (m_channel_impl_map.Exists(header.channel)) { if (auto it = m_channel_impl_map.GetMap().find(header.channel); it != m_channel_impl_map.GetMap().end()) {
R_TRY(this->CheckChannelExist(header.channel)); return m_channel_impl_map[it->second].ProcessReceivePacket(header, body, body_size);
return m_channel_impl_map[header.channel].ProcessReceivePacket(header, body, body_size);
} else { } else {
if (header.packet_type == PacketType_Data || header.packet_type == PacketType_MaxData) { if (header.packet_type == PacketType_Data || header.packet_type == PacketType_MaxData) {
this->SendErrorPacket(header.channel); this->SendErrorPacket(header.channel);
@ -89,7 +87,7 @@ namespace ams::htclow::mux {
/* Iterate the map, checking for valid packet each time. */ /* Iterate the map, checking for valid packet each time. */
for (auto &pair : map) { for (auto &pair : map) {
/* Get the current channel impl. */ /* Get the current channel impl. */
auto &channel_impl = m_channel_impl_map.GetChannelImpl(pair.second); auto &channel_impl = m_channel_impl_map[pair.second];
/* Check for an error packet. */ /* Check for an error packet. */
/* NOTE: it's unclear why Nintendo does this every iteration of the loop... */ /* NOTE: it's unclear why Nintendo does this every iteration of the loop... */
@ -115,8 +113,8 @@ namespace ams::htclow::mux {
/* Remove the packet from the appropriate source. */ /* Remove the packet from the appropriate source. */
if (header.packet_type == PacketType_Error) { if (header.packet_type == PacketType_Error) {
m_global_send_buffer.RemovePacket(); m_global_send_buffer.RemovePacket();
} else if (m_channel_impl_map.Exists(header.channel)) { } else if (auto it = m_channel_impl_map.GetMap().find(header.channel); it != m_channel_impl_map.GetMap().end()) {
m_channel_impl_map[header.channel].RemovePacket(header); m_channel_impl_map[it->second].RemovePacket(header);
} }
/* Notify the task manager. */ /* Notify the task manager. */
@ -130,7 +128,7 @@ namespace ams::htclow::mux {
/* Update the state of all channels in our map. */ /* Update the state of all channels in our map. */
/* NOTE: Nintendo does this highly inefficiently... */ /* NOTE: Nintendo does this highly inefficiently... */
for (auto pair : m_channel_impl_map.GetMap()) { for (auto pair : m_channel_impl_map.GetMap()) {
m_channel_impl_map[pair.first].UpdateState(); m_channel_impl_map[pair.second].UpdateState();
} }
} }

4
libraries/libstratosphere/source/htclow/mux/htclow_mux_channel_impl_map.hpp
View file

@ -52,8 +52,8 @@ namespace ams::htclow::mux {
return m_map; return m_map;
} }
ChannelImpl &operator[](impl::ChannelInternalType channel) { ChannelImpl &operator[](int index) {
return this->GetChannelImpl(channel); return this->GetChannelImpl(index);
} }
}; };