mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-27 00:57:47 +08:00
Code Issues Releases Wiki Activity

rather than installing the task, ask the task to install itself

Browse Source
This commit is contained in:
Joel Bender
2015-09-17 09:49:06 -04:00
parent ec5f74e3fb
commit 4c45c8d70a
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py25/bacpypes/task.py
View File

@@ -166,10 +166,14 @@ class RecurringTask(_Task):
_debug_contents = ('taskInterval',)
def __init__(self, interval=None):
if _debug: RecurringTask._debug("__init__ interval=%r", interval)
_Task.__init__(self)
# save the interval, but do not automatically install
self.taskInterval = interval
def install_task(self, interval=None):
if _debug: RecurringTask._debug("install_task interval=%r", interval)
global _task_manager, _unscheduled_tasks
# set the interval if it hasn't already been set
@@ -182,6 +186,7 @@ class RecurringTask(_Task):
# if there is no task manager, postpone the install
if not _task_manager:
if _debug: RecurringTask._debug(" - no task manager")
_unscheduled_tasks.append(self)
else:
@@ -189,10 +194,13 @@ class RecurringTask(_Task):
now = _task_manager.get_time()
interval = self.taskInterval / 1000.0
self.taskTime = now + interval - (now % interval)
if _debug: RecurringTask._debug(" - task time: %r", self.taskTime)
# install it
_task_manager.install_task(self)
bacpypes_debugging(RecurringTask)
#
# RecurringFunctionTask
#
@@ -261,7 +269,7 @@ class TaskManager(SingletonLogging):
# because a task manager wasn't created yet.
if _unscheduled_tasks:
for task in _unscheduled_tasks:
self.install_task(task)
task.install_task()
def get_time(self):
if _debug: TaskManager._debug("get_time")
@@ -272,6 +280,10 @@ class TaskManager(SingletonLogging):
def install_task(self, task):
if _debug: TaskManager._debug("install_task %r @ %r", task, task.taskTime)
# if the taskTime is None is hasn't been computed correctly
if task.taskTime is None:
raise RuntimeError("task time is None")
# if this is already installed, suspend it
if task.isScheduled:
self.suspend_task(task)