caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Synchronized aapsAutotune call to avoid multi-thread conflicts

Browse source
This commit is contained in:
Philoul 2022-07-08 23:13:12 +02:00
parent 32ccd8583c
commit 6b1f495c28
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
View file

@ -76,21 +76,31 @@ class AutotunePlugin @Inject constructor(
private lateinit var profile: Profile private lateinit var profile: Profile
val autotuneStartHour: Int = 4 val autotuneStartHour: Int = 4
override fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String): String { @Synchronized
override fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String) {
lastRunSuccess = false
calculationRunning = true
tunedProfile = null tunedProfile = null
updateButtonVisibility = View.GONE updateButtonVisibility = View.GONE
lastRunSuccess = false
var logResult = "" var logResult = ""
result = "" result = ""
if (profileFunction.getProfile() == null) { if (profileFunction.getProfile() == null) {
result = rh.gs(R.string.profileswitch_ismissing) result = rh.gs(R.string.profileswitch_ismissing)
return result rxBus.send(EventAutotuneUpdateGui())
calculationRunning = false
return
} }
val detailedLog = sp.getBoolean(R.string.key_autotune_additional_log, false) val detailedLog = sp.getBoolean(R.string.key_autotune_additional_log, false)
calculationRunning = true calculationRunning = true
lastNbDays = "" + daysBack lastNbDays = "" + daysBack
lastRun = dateUtil.now() lastRun = dateUtil.now()
val profileStore = activePlugin.activeProfileSource.profile ?: return rh.gs(R.string.profileswitch_ismissing) val profileStore = activePlugin.activeProfileSource.profile
if (profileStore == null) {
result = rh.gs(R.string.profileswitch_ismissing)
rxBus.send(EventAutotuneUpdateGui())
calculationRunning = false
return
}
selectedProfile = if (profileToTune.isEmpty()) profileFunction.getProfileName() else profileToTune selectedProfile = if (profileToTune.isEmpty()) profileFunction.getProfileName() else profileToTune
profileFunction.getProfile()?.let { currentProfile -> profileFunction.getProfile()?.let { currentProfile ->
profile = profileStore.getSpecificProfile(profileToTune)?.let { ProfileSealed.Pure(it) } ?: currentProfile profile = profileStore.getSpecificProfile(profileToTune)?.let { ProfileSealed.Pure(it) } ?: currentProfile
@ -144,11 +154,11 @@ class AutotunePlugin @Inject constructor(
if (tunedProfile == null) { if (tunedProfile == null) {
result = rh.gs(R.string.autotune_error) result = rh.gs(R.string.autotune_error)
log("TunedProfile is null on day ${i + 1}") log("TunedProfile is null on day ${i + 1}")
calculationRunning = false
rxBus.send(EventAutotuneUpdateGui())
autotuneFS.exportResult(result) autotuneFS.exportResult(result)
autotuneFS.exportLogAndZip(lastRun) autotuneFS.exportLogAndZip(lastRun)
return result rxBus.send(EventAutotuneUpdateGui())
calculationRunning = false
return
} }
} }
result = rh.gs(R.string.autotune_result, dateUtil.dateAndTimeString(lastRun)) result = rh.gs(R.string.autotune_result, dateUtil.dateAndTimeString(lastRun))
@ -193,13 +203,16 @@ class AutotunePlugin @Inject constructor(
} }
tunedProfile?.let { tunedProfile?.let {
lastRunSuccess = true
saveLastRun() saveLastRun()
lastRunSuccess = true
rxBus.send(EventAutotuneUpdateGui()) rxBus.send(EventAutotuneUpdateGui())
calculationRunning = false calculationRunning = false
return result return
} }
return rh.gs(R.string.autotune_error) result = rh.gs(R.string.autotune_error)
rxBus.send(EventAutotuneUpdateGui())
calculationRunning = false
return
} }
private fun showResults(tunedProfile: ATProfile?, pumpProfile: ATProfile): String { private fun showResults(tunedProfile: ATProfile?, pumpProfile: ATProfile): String {

2
core/src/main/java/info/nightscout/androidaps/interfaces/Autotune.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.interfaces
interface Autotune { interface Autotune {
fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String = ""): String fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String = "")
fun atLog(message: String) fun atLog(message: String)
var lastRunSuccess: Boolean var lastRunSuccess: Boolean