Applications dependency, initial realization (#159)

core/app.cpp

@@ -2,9 +2,9 @@
 #include <stdio.h>
 
 extern "C" {
-#include "startup.h"
 #include "furi.h"
 #include "log.h"
+#include "startup.h"
 #include "tty_uart.h"
 }
 
@@ -15,16 +15,19 @@ extern "C" void app() {
     fuprintf(log, "\n=== Welcome to Flipper Zero! ===\n\n");
 
     // FURI startup
-    FuriApp* handlers[sizeof(FLIPPER_STARTUP) / sizeof(FLIPPER_STARTUP[0])];
+    const size_t flipper_app_count = sizeof(FLIPPER_STARTUP) / sizeof(FLIPPER_STARTUP[0]);
+    FuriApp* handlers[flipper_app_count];
 
-    for(size_t i = 0; i < sizeof(FLIPPER_STARTUP) / sizeof(FLIPPER_STARTUP[0]); i++) {
+    for(size_t i = 0; i < flipper_app_count; i++) {
+        // TODO create a dependency tree and run tasks in the desired order
+        furiac_wait_libs(FLIPPER_STARTUP[i].libs);
         handlers[i] = furiac_start(FLIPPER_STARTUP[i].app, FLIPPER_STARTUP[i].name, NULL);
     }
 
     bool is_alive = false;
     do {
         is_alive = false;
-        for(size_t i = 0; i < sizeof(FLIPPER_STARTUP) / sizeof(FLIPPER_STARTUP[0]); i++) {
+        for(size_t i = 0; i < flipper_app_count; i++) {
             if(handlers[i]->handler != NULL) {
                 is_alive = true;
             }
@@ -32,4 +35,6 @@ extern "C" void app() {
         delay(500);
         // TODO add deferred event queue here
     } while(is_alive);
+
+    fuprintf(log, "\n=== Bye from Flipper Zero! ===\n\n");
 }

core/furi.h

@@ -56,6 +56,8 @@ typedef struct {
     TaskHandle_t handler;
     uint8_t records_count; ///< count of records which task open
     FuriRecord* records[MAX_TASK_RECORDS]; ///< list of records which task open
+
+    bool ready;
 } FuriApp;
 
 /*!
@@ -82,6 +84,16 @@ application registry.
 */
 void furiac_exit(void* param);
 
+/*!
+Mark application as prepared and ready to perform actions
+*/
+void furiac_ready();
+
+/* 
+Wait for the libraries we depend on
+*/
+void furiac_wait_libs(const char* libs);
+
 /*!
 Stop specified app without returning to prev application.
 */

core/furi_ac.c

@@ -7,8 +7,11 @@
 #include <stdio.h>
 #endif
 
+#include <string.h>
+
 #define DEFAULT_STACK_SIZE 1024 // Stack size in bytes
 #define MAX_TASK_COUNT 8
+#define INVALID_TASK_ID UINT16_MAX
 
 static StaticTask_t task_info_buffer[MAX_TASK_COUNT];
 static StackType_t stack_buffer[MAX_TASK_COUNT][DEFAULT_STACK_SIZE / 4];
@@ -16,6 +19,45 @@ static FuriApp task_buffer[MAX_TASK_COUNT];
 
 static size_t current_buffer_idx = 0;
 
+uint16_t furiac_get_task_id_by_name(const char* app_name) {
+    for(size_t i = 0; i < MAX_TASK_RECORDS; i++) {
+        if(strcmp(task_buffer[i].name, app_name) == 0) return i;
+    }
+
+    return INVALID_TASK_ID;
+}
+
+void furiac_wait_libs(const char* libs) {
+    char* lib_rest = NULL;
+    char* lib_name = strtok_r((char*)libs, " ", &lib_rest);
+
+    while(lib_name != NULL) {
+        // trim library name
+        for(uint16_t i = 0; i < strlen(lib_name); i++) {
+            if(lib_name[i] == ' ') {
+                lib_name[i] = 0;
+            }
+        }
+
+        uint16_t app_id = furiac_get_task_id_by_name(lib_name);
+
+        if(app_id == INVALID_TASK_ID) {
+#ifdef FURI_DEBUG
+            printf("[FURIAC] Invalid library name %s\n", lib_name);
+#endif
+        } else {
+            while(!task_buffer[app_id].ready) {
+#ifdef FURI_DEBUG
+                printf("[FURIAC] waiting for library \"%s\"\n", lib_name);
+#endif
+                osDelay(50);
+            }
+        }
+
+        lib_name = strtok_r(NULL, " ", &lib_rest);
+    }
+}
+
 // find task pointer by handle
 FuriApp* find_task(TaskHandle_t handler) {
     FuriApp* res = NULL;
@@ -43,6 +85,9 @@ FuriApp* furiac_start(FlipperApplication app, const char* name, void* param) {
         return NULL;
     }
 
+    // application ready
+    task_buffer[current_buffer_idx].ready = false;
+
     // create task on static stack memory
     task_buffer[current_buffer_idx].handler = xTaskCreateStatic(
         (TaskFunction_t)app,
@@ -135,4 +180,25 @@ void furiac_switch(FlipperApplication app, char* name, void* param) {
         // kill itself
         vTaskDelete(NULL);
     }
+}
+
+// set task to ready state
+void furiac_ready() {
+    /* 
+        TODO:
+        Currently i think that better way is to use application name
+        and restrict applications to "one task per application"
+    */
+    FuriApp* app = find_task(xTaskGetCurrentTaskHandle());
+
+    if(app == NULL) {
+#ifdef FURI_DEBUG
+        printf("[FURIAC] cannot find task to set ready state\n");
+#endif
+    } else {
+#ifdef FURI_DEBUG
+        printf("[FURIAC] task is ready\n");
+#endif
+        app->ready = true;
+    }
 }