[DROOLS-751] turn halt invocation into a propagation entry

kiegroup · Nov 17, 2015 · 83a501c · 83a501c
1 parent b9f1bb9
commit 83a501c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 7 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/common/DefaultAgenda.java b/drools-core/src/main/java/org/drools/core/common/DefaultAgenda.java
@@ -1261,9 +1261,6 @@ public void fireUntilHalt(final AgendaFilter agendaFilter) {
             PropagationEntry head = tryHalt();
             while (head != null) {
                 workingMemory.flushPropagationsOnFireUntilHalt( fireNextItem( agendaFilter, 0, -1 ) > 0, head );
-                if (currentState == ExecutionState.FORCE_HALTING) {
-                    break;
-                }
                 head = workingMemory.takeAllPropagations();
             }
 
@@ -1300,6 +1297,9 @@ public int fireAllRules(AgendaFilter agendaFilter,
             while (head != null) {
                 fireCount += fireNextItem( agendaFilter, fireCount, fireLimit );
                 SynchronizedPropagationList.flush(workingMemory, head);
+                if (currentState == ExecutionState.FORCE_HALTING) {
+                    break;
+                }
                 head = workingMemory.takeAllPropagations();
             }
 

diff --git a/drools-core/src/main/java/org/drools/core/impl/StatefulKnowledgeSessionImpl.java b/drools-core/src/main/java/org/drools/core/impl/StatefulKnowledgeSessionImpl.java
@@ -1252,8 +1252,21 @@ public InternalKnowledgeBase getKnowledgeBase() {
     }
 
     public void halt() {
-        this.agenda.halt();
-        notifyHalt();
+        propagationList.addEntryToTop( new Halt() );
+    }
+
+    private static class Halt extends PropagationEntry.AbstractPropagationEntry {
+
+        @Override
+        public void execute( InternalWorkingMemory wm ) {
+            wm.getAgenda().halt();
+            wm.notifyHalt();
+        }
+
+        @Override
+        public String toString() {
+            return "Halt";
+        }
     }
 
     public int fireAllRules() {

diff --git a/drools-core/src/main/java/org/drools/core/phreak/PropagationList.java b/drools-core/src/main/java/org/drools/core/phreak/PropagationList.java
@@ -19,6 +19,7 @@
 
 public interface PropagationList {
     void addEntry(PropagationEntry propagationEntry);
+    void addEntryToTop(PropagationEntry propagationEntry);
 
     PropagationEntry takeAll();
 

diff --git a/drools-core/src/main/java/org/drools/core/phreak/SynchronizedBypassPropagationList.java b/drools-core/src/main/java/org/drools/core/phreak/SynchronizedBypassPropagationList.java
@@ -29,6 +29,10 @@ public SynchronizedBypassPropagationList(InternalWorkingMemory workingMemory) {
 
     @Override
     public void addEntry(final PropagationEntry propagationEntry) {
+        doAddEntry( propagationEntry, false );
+    }
+
+    private void doAddEntry( final PropagationEntry propagationEntry, final boolean addToTop ) {
         workingMemory.getAgenda().executeTask( new ExecutableEntry() {
            @Override
            public void execute() {
@@ -40,18 +44,31 @@ public void execute() {
                        flush();
                    }
                } else {
-                   internalAddEntry( propagationEntry );
+                   doAdd();
                }
            }
 
            @Override
            public void enqueue() {
-               internalAddEntry( propagationEntry );
+               doAdd();
+           }
+
+            private void doAdd() {
+               if (addToTop) {
+                   SynchronizedBypassPropagationList.super.addEntryToTop( propagationEntry );
+               } else {
+                   internalAddEntry( propagationEntry );
+               }
            }
         });
         notifyHalt();
     }
 
+    @Override
+    public void addEntryToTop(PropagationEntry propagationEntry ) {
+        doAddEntry( propagationEntry, true );
+    }
+
     @Override
     public void flush() {
         if (!executing.get()) {

diff --git a/drools-core/src/main/java/org/drools/core/phreak/SynchronizedPropagationList.java b/drools-core/src/main/java/org/drools/core/phreak/SynchronizedPropagationList.java
@@ -49,6 +49,20 @@ public void enqueue() {
         }
     }
 
+    @Override
+    public synchronized void addEntryToTop(final PropagationEntry entry) {
+        boolean wasEmpty = head == null;
+        if ( !wasEmpty ) {
+            entry.setNext( head );
+            tail = head;
+        }
+        head = entry;
+
+        if ( wasEmpty ) {
+            notifyHalt();
+        }
+    }
+
     protected synchronized void internalAddEntry( PropagationEntry entry ) {
         boolean wasEmpty = head == null;
         if ( wasEmpty ) {

diff --git a/drools-reteoo/src/main/java/org/drools/reteoo/common/RetePropagationList.java b/drools-reteoo/src/main/java/org/drools/reteoo/common/RetePropagationList.java
@@ -36,6 +36,11 @@ public void addEntry(PropagationEntry propagationEntry) {
         propagationEntry.execute(workingMemory);
     }
 
+    @Override
+    public void addEntryToTop(PropagationEntry propagationEntry) {
+        addEntry(propagationEntry);
+    }
+
     @Override
     public PropagationEntry takeAll() {
         return null;