Pogress

- Still a problem, getting obscolete calls after a garbage collect where
i should not get them ...

Moose Development/Moose/Core/Scheduler2.lua

@@ -58,18 +58,7 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
   local self = BASE:Inherit( self, BASE:New() )
   self:F2( { StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds } )
 
-  self.TimeEventObject = TimeEventObject
-  self.TimeEventFunction = TimeEventFunction
-  self.TimeEventFunctionArguments = TimeEventFunctionArguments
-  self.StartSeconds = StartSeconds
-  self.Repeat = false
-  self.RepeatSecondsInterval = RepeatSecondsInterval or 0
-  self.RandomizationFactor = RandomizationFactor or 0
-  self.StopSeconds = StopSeconds
-
-  self.StartTime = timer.getTime()
-
-  _TIMERDISPATCHER:AddSchedule( self )
+  self:Schedule( TimeEventObject, TimeEventFunction, TimeEventFunctionArguments, StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds )
 
   return self
 end
@@ -119,6 +108,8 @@ function SCHEDULER:Start()
       timer.removeFunction( self.ScheduleID )
     end
     self:T( { self.StartSeconds } )
+    _TIMERDISPATCHER:AddSchedule( self )
+
     self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .001 )
   end
   

Moose Development/Moose/Core/Timer.lua

@@ -103,7 +103,7 @@ function TIMER:AddSchedule( Scheduler, ScheduleFunction, ScheduleArguments, Star
       local StartTime = CurrentTime + Start
       
       if Status and (( Result == nil ) or ( Result and Result ~= false ) ) then
-        if Repeat ~= 0 and ( not Stop ) or ( Stop and CurrentTime <= StartTime + Stop ) then
+        if Repeat ~= 0 and ( Stop == 0 ) or ( Stop ~= 0 and CurrentTime <= StartTime + Stop ) then
           local ScheduleTime =
             CurrentTime +
             Repeat +

Moose Test Missions/SCH - Scheduler/SCH-000 - Simple Scheduling/SCH-000 - Simple Scheduling.lua

@@ -19,6 +19,15 @@
 
 local TestScheduler = SCHEDULER:New( nil, 
   function()
-    BASE:E( "Hello World")
+    BASE:E( "Hello World 1")
   end, {}, 1 
-  )
+  )
+
+SCHEDULER:New( nil, 
+  function()
+    BASE:E( "Hello World 2")
+  end, {}, 2
+  )
+    
+collectgarbage()
+

Moose Test Missions/SCH - Scheduler/SCH-300 - GC Simple Object Scheduling/SCH-300 - GC Simple Object Scheduling.lua

@@ -42,19 +42,22 @@ end
 
 do
 local Test1 = TEST_BASE:New( "Hello World Test 1" ) 
+collectgarbage()
 Test1 = nil
+collectgarbage()
 BASE:E( Test1 )
 end
+collectgarbage()
 
 local Test2 = TEST_BASE:New( "Hello World Test 2" ) 
-
+collectgarbage()
+BASE:E( Test2 )
 
 local Test3 = TEST_BASE:New( "Hello World Test 3" ) 
 Test3 = nil
 
 collectgarbage()
 
-BASE:E( Test2 )
 BASE:E( Test3 )
 
 BASE:E( "Collect Garbage executed." )

Moose Test Missions/SCH - Scheduler/SCH-310 - GC Object Repeat Scheduling/SCH-310 - GC Object Repeat Scheduling.lua

@@ -0,0 +1,80 @@
+--- Object Repeat Scheduling.
+-- 
+-- ===
+-- 
+-- Author: FlightControl
+-- Date Created: 13 Dec 2016
+--
+-- # Situation
+-- Three objects Test1, Test2, Test 3 are created with schedule a function.
+-- After 15 seconds, Test1 is nillified and Garbage Collect is done.
+-- After 30 seconds, Test2 is nillified and Garbage Collect is done.
+-- After 45 seconds, Test3 is nillified and Garbage Collect is done.
+-- Uses the Tracing functions from BASE within the DCS.log file. Check the DCS.log file for the results.
+-- Create a new SCHEDULER object.
+-- Check the DCS.log.
+-- 
+-- 
+-- Three Test objects are created.
+-- 
+-- # Test cases:
+-- 
+-- 1. Object Test1 should start after 1 seconds showing every second "Hello World Repeat 1".
+-- 2. Object Test2 should start after 2 seconds showing every 2 seconds "Hello World Repeat 2" and stop after one minute.
+-- 3. Object Test3 should start after 10 seconds showing with a 10 seconds randomized interval of 10 seconds "Hello World Repeat 3" and stop after one minute.
+-- 4. After 15 seconds, Test1 should stop working. No "Hello World Repeat 1" may be shown after 15 seconds.
+-- 5. After 30 seconds, Test2 should stop working. No "Hello World Repeat 2" may be shown after 30 seconds.
+-- 6. After 45 seconds, Test3 should stop working. No "Hello World Repeat 3" may be shown after 45 seconds.
+-- 
+-- # Status: TESTED - 13 Dec 2016
+
+local TEST_BASE = {
+    ClassName = "TEST_BASE",
+  }
+  
+function TEST_BASE:New( Message, Start, Repeat, Randomize, Stop )
+  self = BASE:Inherit( self, BASE:New() )
+  
+  self.TestScheduler = SCHEDULER:New( self,
+    function( Object, Message )
+      Object:E( Message )
+    end, { Message }, Start, Repeat, Randomize, Stop
+    )
+    return self
+end
+
+do
+local Test1 = TEST_BASE:New( "Hello World Repeat 1", 1, 1 ) 
+
+-- Nillify Test1 after 15 seconds and garbage collect.
+local Nil1 = SCHEDULER:New( nil,
+  function()
+    BASE:E( "Nillify Test1 and Garbage Collect" )
+    Test1 = nil
+    collectgarbage()
+  end, {}, 15 )
+
+end
+
+local Test2 = TEST_BASE:New( "Hello World Repeat 2", 2, 2, 0, 60 ) 
+
+
+local Test3 = TEST_BASE:New( "Hello World Repeat 3", 10, 10, 1.0, 60 ) 
+
+-- Nillify Test2 after 30 seconds and garbage collect.
+local Nil2 = SCHEDULER:New( nil,
+  function()
+    BASE:E( "Nillify Test2 and Garbage Collect" )
+    Test2 = nil
+    collectgarbage()
+  end, {}, 30 )
+
+-- Nillify Test3 after 45 seconds and garbage collect.
+local Nil3 = SCHEDULER:New( nil,
+  function()
+    BASE:E( "Nillify Test3 and Garbage Collect" )
+    Test3 = nil
+    collectgarbage()
+  end, {}, 45 )
+
+collectgarbage()