schedule: twb: run task_complete() as the last step in thread fn

Reworked task thread flow to run task_complete as the last step

Signed-off-by: Adrian Bonislawski <[email protected]>

src/schedule/zephyr_twb_schedule.c

@@ -178,8 +178,6 @@ static void twb_thread_fn(void *p1, void *p2, void *p3)
 
 		if (task->state == SOF_TASK_STATE_RUNNING) {
 			state = task_run(task);
-			if (state == SOF_TASK_STATE_COMPLETED)
-				task_complete(task);
 		} else {
 			state = task->state;	/* to avoid undefined variable warning */
 		}
@@ -190,18 +188,20 @@ static void twb_thread_fn(void *p1, void *p2, void *p3)
 		 * if not, set the state returned by run procedure
 		 */
 		if (task->state == SOF_TASK_STATE_RUNNING) {
-			task->state = state;
+			if (pdata->cycles_granted) {
+				k_thread_runtime_stats_get(pdata->thread_id, &rt_stats_thread);
+				pdata->cycles_consumed += rt_stats_thread.execution_cycles - pdata->cycles_ref;
+				pdata->cycles_ref = rt_stats_thread.execution_cycles;
+			}
 			switch (state) {
 			case SOF_TASK_STATE_RESCHEDULE:
 				/* mark to reschedule, schedule time is already calculated */
 				task->state = SOF_TASK_STATE_QUEUED;
+				break;
 			case SOF_TASK_STATE_CANCEL:
+				task->state = SOF_TASK_STATE_CANCEL;
+				break;
 			case SOF_TASK_STATE_COMPLETED:
-				if (pdata->cycles_granted) {
-					k_thread_runtime_stats_get(pdata->thread_id, &rt_stats_thread);
-					pdata->cycles_consumed += rt_stats_thread.execution_cycles - pdata->cycles_ref;
-					pdata->cycles_ref = rt_stats_thread.execution_cycles;
-				}
 				break;
 
 			default:
@@ -212,7 +212,12 @@ static void twb_thread_fn(void *p1, void *p2, void *p3)
 
 		scheduler_twb_unlock(lock_key);
 
-		if (task->state != SOF_TASK_STATE_RUNNING)
+		if (state == SOF_TASK_STATE_COMPLETED) {
+			task->state = SOF_TASK_STATE_COMPLETED;
+			task_complete(task);
+		}
+
+		if (state != SOF_TASK_STATE_RUNNING)
 			k_sem_take(&pdata->sem, K_FOREVER);
 	};
 	/* never be here */