mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-05 21:33:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: nodeDBbyNodeNum to ConcurrentHashMap

Browse Source
This commit is contained in:
andrekir
2024-01-10 05:30:02 -03:00
parent 1691acb59d
commit 505ba8a7d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -44,6 +44,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.withTimeoutOrNull
import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentLinkedQueue
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
@@ -351,7 +352,7 @@ class MeshService : Service(), Logging {
/**
* discard entire node db & message state - used when downloading a new db from the device
*/
private fun discardNodeDB() = synchronized(nodeDBbyNodeNum) {
private fun discardNodeDB() {
debug("Discarding NodeDB")
myNodeInfo = null
nodeDBbyNodeNum.clear()
@@ -370,7 +371,7 @@ class MeshService : Service(), Logging {
private var haveNodeDB = false
// The database of active nodes, index is the node number
private val nodeDBbyNodeNum = mutableMapOf<Int, NodeInfo>()
private val nodeDBbyNodeNum = ConcurrentHashMap<Int, NodeInfo>()
/// The database of active nodes, index is the node user ID string
/// NOTE: some NodeInfos might be in only nodeDBbyNodeNum (because we don't yet know
@@ -425,8 +426,7 @@ class MeshService : Service(), Logging {
/**
* How many nodes are currently online (including our local node)
*/
private val numOnlineNodes
get() = synchronized(nodeDBbyNodeNum) { nodeDBbyNodeNum.values.count { it.isOnline } }
private val numOnlineNodes get() = nodeDBbyNodeNum.values.count { it.isOnline }
private fun toNodeNum(id: String): Int = when (id) {
DataPacket.ID_BROADCAST -> DataPacket.NODENUM_BROADCAST