mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

refactor: `nodeDBbyNodeNum` to ConcurrentHashMap

pull/810/head
andrekir 2024-01-10 05:30:02 -03:00
rodzic 1691acb59d
commit 505ba8a7d3
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
Wyświetl plik

@ -44,6 +44,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.ConcurrentLinkedQueue
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException 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 * 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") debug("Discarding NodeDB")
myNodeInfo = null myNodeInfo = null
nodeDBbyNodeNum.clear() nodeDBbyNodeNum.clear()
@ -370,7 +371,7 @@ class MeshService : Service(), Logging {
private var haveNodeDB = false private var haveNodeDB = false
// The database of active nodes, index is the node number // 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 /// 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 /// 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) * How many nodes are currently online (including our local node)
*/ */
private val numOnlineNodes private val numOnlineNodes get() = nodeDBbyNodeNum.values.count { it.isOnline }
get() = synchronized(nodeDBbyNodeNum) { nodeDBbyNodeNum.values.count { it.isOnline } }
private fun toNodeNum(id: String): Int = when (id) { private fun toNodeNum(id: String): Int = when (id) {
DataPacket.ID_BROADCAST -> DataPacket.NODENUM_BROADCAST DataPacket.ID_BROADCAST -> DataPacket.NODENUM_BROADCAST