caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

NSCv3: improve scheduling

Browse source
This commit is contained in:
Milos Kozak 2023-01-05 20:30:40 +01:00
parent 86b8d763e6
commit c25c9cedbf
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
View file

@ -196,18 +196,18 @@ class NSClientV3Plugin @Inject constructor(
disposable += rxBus
.toObservable(EventNewBG::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ scheduleExecution() }, fabricPrivacy::logException)
.subscribe({ scheduleExecution("NEW_BG") }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventNewHistoryData::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ scheduleExecution() }, fabricPrivacy::logException)
.subscribe({ scheduleExecution("NEW_DATA") }, fabricPrivacy::logException)
runLoop = Runnable {
handler.postDelayed(runLoop, REFRESH_INTERVAL)
executeLoop()
executeLoop("MAIN_LOOP")
}
handler.postDelayed(runLoop, REFRESH_INTERVAL)
executeLoop()
executeLoop("START")
}
override fun onStop() {
@ -273,7 +273,7 @@ class NSClientV3Plugin @Inject constructor(
}
override fun resend(reason: String) {
executeLoop()
executeLoop("RESEND")
}
override fun pause(newState: Boolean) {
@ -654,13 +654,17 @@ class NSClientV3Plugin @Inject constructor(
}
fun scheduleNewExecution() {
var toTime = lastLoadedSrvModified.collections.entries + T.mins(6).plus(T.secs(0)).msecs()
if (toTime < dateUtil.now()) toTime = dateUtil.now() + T.mins(1).plus(T.secs(0)).msecs()
handler.postDelayed({ executeLoop() }, toTime - dateUtil.now())
var origin = "5_MIN_AFTER_BG"
var toTime = lastLoadedSrvModified.collections.entries + T.mins(5).plus(T.secs(10)).msecs()
if (toTime < dateUtil.now()) {
toTime = dateUtil.now() + T.mins(1).plus(T.secs(0)).msecs()
origin = "1_MIN_OLD_DATA"
}
handler.postDelayed({ executeLoop(origin) }, toTime - dateUtil.now())
rxBus.send(EventNSClientNewLog("NEXT", dateUtil.dateAndTimeAndSecondsString(toTime)))
}
private fun executeLoop() {
private fun executeLoop(origin: String) {
if (sp.getBoolean(R.string.key_ns_client_paused, false)) {
rxBus.send(EventNSClientNewLog("RUN", "paused"))
return
@ -670,9 +674,9 @@ class NSClientV3Plugin @Inject constructor(
return
}
if (workIsRunning(arrayOf(JOB_NAME)))
rxBus.send(EventNSClientNewLog("RUN", "Already running"))
rxBus.send(EventNSClientNewLog("RUN", "Already running $origin"))
else {
rxBus.send(EventNSClientNewLog("RUN", "Starting next round"))
rxBus.send(EventNSClientNewLog("RUN", "Starting next round $origin"))
WorkManager.getInstance(context)
.beginUniqueWork(
"NSCv3Load",
@ -700,12 +704,12 @@ class NSClientV3Plugin @Inject constructor(
private val eventWorker = Executors.newSingleThreadScheduledExecutor()
private var scheduledEventPost: ScheduledFuture<*>? = null
private fun scheduleExecution() {
private fun scheduleExecution(origin: String) {
class PostRunnable : Runnable {
override fun run() {
scheduledEventPost = null
executeLoop()
executeLoop(origin)
}
}
// cancel waiting task to prevent sending multiple posts

5
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
View file

@ -57,6 +57,7 @@ class LoadBgWorker(
sgvs = response.values
response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.entries = it }
nsClientV3Plugin.storeLastLoadedSrvModified()
nsClientV3Plugin.scheduleNewExecution() // Idea is to run after 5 min after last BG
}
aapsLogger.debug("SGVS: $sgvs")
if (sgvs.isNotEmpty()) {
@ -97,9 +98,7 @@ class LoadBgWorker(
nsClientV3Plugin.lastLoadedSrvModified.collections.entries = lastLoaded
nsClientV3Plugin.storeLastLoadedSrvModified()
}
rxBus.send(EventNSClientNewLog("RCV END", "No new SGVs from ${dateUtil
.dateAndTimeAndSecondsString(lastLoaded)}"))
nsClientV3Plugin.scheduleNewExecution() // Idea is to run after 5 min after last BG
rxBus.send(EventNSClientNewLog("RCV END", "No new SGVs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
WorkManager.getInstance(context)
.beginUniqueWork(
NSClientV3Plugin.JOB_NAME,