durable_rules 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2b95c8e4b55277ee44b58323b886608f8496795
-  data.tar.gz: 80c64211b631d8e79f232f582088f6e599217ec0
+  metadata.gz: bf45128fee07cc96208c6acf6ad9145efdf26a42
+  data.tar.gz: c6ee78e78cc7cf95feb99d325e1afb382a9d49c6
 SHA512:
-  metadata.gz: 62f9a2c8f834b30c9ba64390d95612118347efe81172f26f5ae3d74367a66a74208df88f0294812c9896d069f497cb67fcba2890b02e263f0884f269b53bac71
-  data.tar.gz: e5b051bd03d1e163f02c3e154060bd3787a98e2f5886e034e633e826565bee0d6b2b90d654d805bd6f9f88d19499ca5434301622bdb3e336720c9426d306914f
+  metadata.gz: 6f85c1d8a6d9afad3489c151e0af655649c5f5f43c4b33ed7c65e73c1bba31e1a3421bd2a901589c14839fedf80a645f98f07bd2be818be7d1a60f7f6d21aec9
+  data.tar.gz: 767a9be4effd44052779b0fd568fa9f70c5c8da482ffb6022c23fcfa497c6a725d5d923ce7a375f78dc121999b93da19fd70d3b2d51084c3fc1fa994c6f0f09e

data/src/rules/events.c

@@ -2236,8 +2236,10 @@ unsigned int startActionForState(unsigned int handle,
     unsigned int actionStateIndex;
     unsigned int resultCount;
     unsigned int resultFrameOffset;
+    time_t currentTime = time(NULL);
     
     CHECK_RESULT(getNextResultInState(tree,
+                                      currentTime,
                                       resultState,
                                       &actionStateIndex,
                                       &resultCount,
@@ -2256,7 +2258,7 @@ unsigned int startActionForState(unsigned int handle,
     resultState->context.actionStateIndex = actionStateIndex;
     resultState->context.resultCount = resultCount;
     resultState->context.resultFrameOffset = resultFrameOffset;
-    resultState->lockExpireTime = time(NULL) + STATE_LEASE_TIME;
+    resultState->lockExpireTime = currentTime + STATE_LEASE_TIME;
     *messages = resultState->context.messages;
     *stateFact = resultState->context.stateFact;
     
@@ -2302,6 +2304,7 @@ static unsigned int deleteCurrentAction(ruleset *tree,
 
                     mid[midProperty->valueLength] = '\0';
 
+
                     CHECK_RESULT(handleDeleteMessage(tree,
                                                      state,
                                                      mid, 
@@ -2311,10 +2314,7 @@ static unsigned int deleteCurrentAction(ruleset *tree,
         }
 
         resultFrameOffset = resultFrame->nextOffset;
-        unsigned int result = deleteDispatchingActionFrame(state, resultLocation);
-        if (result != RULES_OK) {
-            return result;
-        }
+        CHECK_RESULT(deleteDispatchingActionFrame(state, resultLocation));
     }
 
     return RULES_OK;
@@ -2345,16 +2345,17 @@ unsigned int completeAndStartAction(unsigned int handle,
                                      resultState->context.actionStateIndex,
                                      resultState->context.resultCount,
                                      resultState->context.resultFrameOffset));
-
-    
+ 
     freeActionContext(resultState);
     
     actionStateNode *resultAction;
     unsigned int actionStateIndex;
     unsigned int resultCount;
     unsigned int resultFrameOffset;
+    time_t currentTime = time(NULL);
     
     CHECK_RESULT(getNextResultInState(tree,
+                                      currentTime,
                                       resultState,
                                       &actionStateIndex,
                                       &resultCount,
@@ -2370,7 +2371,7 @@ unsigned int completeAndStartAction(unsigned int handle,
     resultState->context.actionStateIndex = actionStateIndex;
     resultState->context.resultCount = resultCount;
     resultState->context.resultFrameOffset = resultFrameOffset;
-    resultState->lockExpireTime = time(NULL) + STATE_LEASE_TIME;
+    resultState->lockExpireTime = currentTime + STATE_LEASE_TIME;
     *messages  = resultState->context.messages;
     return RULES_OK;
 }

data/src/rules/state.c

@@ -1126,6 +1126,7 @@ unsigned int serializeState(stateNode *state,
 }
 
 unsigned int getNextResultInState(void *tree, 
+                                  time_t currentTime,
                                   stateNode *state,
                                   unsigned int *actionStateIndex,
                                   unsigned int *resultCount,
@@ -1134,23 +1135,25 @@ unsigned int getNextResultInState(void *tree,
 
     ruleset *rulesetTree = (ruleset*)tree;
     *resultAction = NULL;
-    for (unsigned int index = 0; index < rulesetTree->actionCount; ++index) {
-        actionStateNode *actionNode = &state->actionState[index];
-        if (actionNode->reteNode) {
-            if ((actionNode->reteNode->value.c.cap && actionNode->resultPool.count) ||
-                (actionNode->reteNode->value.c.count && actionNode->resultPool.count >= actionNode->reteNode->value.c.count)) {
-                *resultAction = actionNode;
-                *actionStateIndex = index;
-                *resultFrameOffset = actionNode->resultIndex[0];
-                if (actionNode->reteNode->value.c.count) {
-                    *resultCount = actionNode->reteNode->value.c.count;
-                } else {
-                    *resultCount = (actionNode->reteNode->value.c.cap > actionNode->resultPool.count ? 
-                                    actionNode->resultPool.count : 
-                                    actionNode->reteNode->value.c.cap);
+    if (currentTime - state->lockExpireTime > STATE_LEASE_TIME) { 
+        for (unsigned int index = 0; index < rulesetTree->actionCount; ++index) {
+            actionStateNode *actionNode = &state->actionState[index];
+            if (actionNode->reteNode) {
+                if ((actionNode->reteNode->value.c.cap && actionNode->resultPool.count) ||
+                    (actionNode->reteNode->value.c.count && actionNode->resultPool.count >= actionNode->reteNode->value.c.count)) {
+                    *resultAction = actionNode;
+                    *actionStateIndex = index;
+                    *resultFrameOffset = actionNode->resultIndex[0];
+                    if (actionNode->reteNode->value.c.count) {
+                        *resultCount = actionNode->reteNode->value.c.count;
+                    } else {
+                        *resultCount = (actionNode->reteNode->value.c.cap > actionNode->resultPool.count ? 
+                                        actionNode->resultPool.count : 
+                                        actionNode->reteNode->value.c.cap);
+                    }
+
+                    return RULES_OK;
                 }
-
-                return RULES_OK;
             }
         }
     }
@@ -1177,18 +1180,18 @@ unsigned int getNextResult(void *tree,
     while (count < rulesetTree->statePool.count && !*resultAction) {
         unsigned int nodeOffset = rulesetTree->reverseStateIndex[rulesetTree->currentStateIndex];
         *resultState = STATE_NODE(tree, nodeOffset);
-        if (currentTime - (*resultState)->lockExpireTime > STATE_LEASE_TIME) { 
-            unsigned int result = getNextResultInState(tree,
-                                                       *resultState,
-                                                       actionStateIndex,
-                                                       resultCount,
-                                                       resultFrameOffset,
-                                                       resultAction);
-            if (result != ERR_NO_ACTION_AVAILABLE) {
-                return result;
-            }
+        
+        unsigned int result = getNextResultInState(tree,
+                                                   currentTime,
+                                                   *resultState,
+                                                   actionStateIndex,
+                                                   resultCount,
+                                                   resultFrameOffset,
+                                                   resultAction);
+        if (result != ERR_NO_ACTION_AVAILABLE) {
+            return result;
         }
-
+        
         rulesetTree->currentStateIndex = (rulesetTree->currentStateIndex + 1) % rulesetTree->statePool.count;
         ++count;
     }

data/src/rules/state.h

@@ -351,6 +351,7 @@ unsigned int serializeState(stateNode *state,
                             char **stateFact);
 
 unsigned int getNextResultInState(void *tree, 
+                                  time_t currentTime,
                                   stateNode *state,
                                   unsigned int *actionStateIndex,
                                   unsigned int *resultCount,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake