Active Object: add fields to struct and constructor

polesskiy-dev · Jul 30, 2023 · 1267cdd · 1267cdd
1 parent 813ca7b
commit 1267cdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/examples/request-fsm/main.c b/examples/request-fsm/main.c
@@ -38,7 +38,11 @@ const char *const STATES_STRINGS[] = {
         "REQUEST_NO_ST", "PENDING_ST", "SUCCESS_ST", "ERROR_ST"
 };
 
-DECLARE_ACTIVE_OBJECT(REQUEST_AO, REQUEST_EVENT, REQUEST_STATE, REQUEST_AO_ID, REQUEST_QUEUE_MAX_CAPACITY);
+typedef struct {
+    uint8_t maxRetries;
+} REQUEST_AO_FIELDS;
+
+DECLARE_ACTIVE_OBJECT(REQUEST_AO, REQUEST_EVENT, REQUEST_STATE, REQUEST_AO_FIELDS, REQUEST_AO_ID, REQUEST_QUEUE_MAX_CAPACITY);
 DECLARE_FSM(REQUEST_AO, REQUEST_EVENT, REQUEST_STATE, REQUEST_SIG_MAX, REQUEST_ST_MAX);
 
 /**
@@ -61,11 +65,8 @@ REQUEST_STATE_HANDLE_F requestTransitionTable[REQUEST_ST_MAX][REQUEST_SIG_MAX] =
         [PENDING_ST]=       {[REQUEST_SUCCESS_SIG]=requestSuccess, [REQUEST_ERROR_SIG]=GUARD(canRetry, performRequest, requestError), [TIMEOUT_SIG]=GUARD(canRetry, performRequest, requestError)}
 };
 
-// TODO should we pass cb to state transition?
-int maxRetries = 4;
-
 int main(void) {
-    REQUEST_AO_Ctor(&requestActiveObject, REQUEST_NO_ST);
+    REQUEST_AO_Ctor(&requestActiveObject, REQUEST_NO_ST, (REQUEST_AO_FIELDS){.maxRetries = 4});
 
     printf("Starting Request FSM\n");
     printf("Dispatching MAKE REQUEST Event\n");

diff --git a/main b/main
diff --git a/src/active-object/active-object.h b/src/active-object/active-object.h
@@ -28,14 +28,15 @@ void ACTIVE_OBJECT_BASE_Ctor(ACTIVE_OBJECT_BASE *const self, uint8_t id) {
     self->id = id;
 };
 
-#define DECLARE_ACTIVE_OBJECT(ACTIVE_OBJECT_T, EVENT_T, STATE_T, id, maxQueueCapacity)                      \
+#define DECLARE_ACTIVE_OBJECT(ACTIVE_OBJECT_T, EVENT_T, STATE_T, FIELDS_T, id, maxQueueCapacity)                      \
                                                                                                               \
     DECLARE_QUEUE(EVENT_T, maxQueueCapacity);                                                                  \
                                                                                                               \
     typedef struct {                                                                                          \
         ACTIVE_OBJECT_BASE super;                                         \
         QUEUE_##EVENT_T queue;                           \
-        STATE_T state;                                   \
+        STATE_T state;                                                                                           \
+        FIELDS_T fields;    \
     } ACTIVE_OBJECT_T;                                                                                            \
                                                                                                                   \
     /**
@@ -45,10 +46,11 @@ void ACTIVE_OBJECT_BASE_Ctor(ACTIVE_OBJECT_BASE *const self, uint8_t id) {
                                                                                                                   \
     typedef void (*ACTIVE_OBJECT_T##HAS_EMPTY_QUEUE_F)(ACTIVE_OBJECT_T *const self);  \
                                                                                                               \
-    void ACTIVE_OBJECT_T##_Ctor(ACTIVE_OBJECT_T *const self, STATE_T initialState) {                              \
+    void ACTIVE_OBJECT_T##_Ctor(ACTIVE_OBJECT_T *const self, STATE_T initialState, FIELDS_T fields) {                              \
         ACTIVE_OBJECT_BASE_Ctor(&self->super, id); \
         QUEUE_##EVENT_T##_Ctor(&self->queue);                                                                 \
-        self->state = initialState;                                                                             \
+        self->state = initialState;                                                                                   \
+        self->fields = fields;  \
     };                                                                                                              \
                                                                                                                  \
     void ACTIVE_OBJECT_T##_Dispatch(ACTIVE_OBJECT_T *const self, EVENT_T event) {         \