修改EventEngine的启动函数，允许不启动Timer

wanglixiong · Jan 4, 2017 · ac190f5 · ac190f5
1 parent 5ef87e7
commit ac190f5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/vn.event/eventEngine.py b/vn.event/eventEngine.py
@@ -109,16 +109,20 @@ def __onTimer(self):
         self.put(event)    
 
     #----------------------------------------------------------------------
-    def start(self):
-        """引擎启动"""
+    def start(self, timer=True):
+        """
+        引擎启动
+        timer：是否要启动计时器
+        """
         # 将引擎设为启动
         self.__active = True
 
         # 启动事件处理线程
         self.__thread.start()
 
         # 启动计时器，计时器事件间隔默认设定为1秒
-        self.__timer.start(1000)
+        if timer:
+            self.__timer.start(1000)
 
     #----------------------------------------------------------------------
     def stop(self):
@@ -245,17 +249,21 @@ def __runTimer(self):
             sleep(self.__timerSleep)
 
     #----------------------------------------------------------------------
-    def start(self):
-        """引擎启动"""
+    def start(self, timer=True):
+        """
+        引擎启动
+        timer：是否要启动计时器
+        """
         # 将引擎设为启动
         self.__active = True
 
         # 启动事件处理线程
         self.__thread.start()
 
         # 启动计时器，计时器事件间隔默认设定为1秒
-        self.__timerActive = True
-        self.__timer.start()
+        if timer:
+            self.__timerActive = True
+            self.__timer.start()
 
     #----------------------------------------------------------------------
     def stop(self):

diff --git a/vn.trader/eventEngine.py b/vn.trader/eventEngine.py
@@ -109,16 +109,20 @@ def __onTimer(self):
         self.put(event)    
 
     #----------------------------------------------------------------------
-    def start(self):
-        """引擎启动"""
+    def start(self, timer=True):
+        """
+        引擎启动
+        timer：是否要启动计时器
+        """
         # 将引擎设为启动
         self.__active = True
 
         # 启动事件处理线程
         self.__thread.start()
 
         # 启动计时器，计时器事件间隔默认设定为1秒
-        self.__timer.start(1000)
+        if timer:
+            self.__timer.start(1000)
 
     #----------------------------------------------------------------------
     def stop(self):
@@ -245,17 +249,21 @@ def __runTimer(self):
             sleep(self.__timerSleep)
 
     #----------------------------------------------------------------------
-    def start(self):
-        """引擎启动"""
+    def start(self, timer=True):
+        """
+        引擎启动
+        timer：是否要启动计时器
+        """
         # 将引擎设为启动
         self.__active = True
 
         # 启动事件处理线程
         self.__thread.start()
 
         # 启动计时器，计时器事件间隔默认设定为1秒
-        self.__timerActive = True
-        self.__timer.start()
+        if timer:
+            self.__timerActive = True
+            self.__timer.start()
 
     #----------------------------------------------------------------------
     def stop(self):

diff --git a/vn.trader/vtEngine.py b/vn.trader/vtEngine.py
@@ -23,7 +23,7 @@ class MainEngine(object):
     def __init__(self):
         """Constructor"""
         # 创建事件引擎
-        self.eventEngine = EventEngine2()
+        self.eventEngine = EventEngine()
         self.eventEngine.start()
 
         # 创建数据引擎