Added timeout parameter to OMCSession and OMCSessionZMQ

Author: adeas31

OMPython/__init__.py

@@ -163,7 +163,7 @@ def _get_omc_path(self):
             raise
 
     @abc.abstractmethod
-    def _connect_to_omc(self):
+    def _connect_to_omc(self, timeout):
         pass
 
     # FIXME: we should have one function which interacts with OMC. Either execute OR sendExpression.
@@ -396,20 +396,20 @@ def getClassNames(self, className=None, recursive=False, qualified=False, sort=F
 
 class OMCSession(OMCSessionBase):
 
-    def __init__(self, readonly=False):
+    def __init__(self, readonly=False, timeout = 0.25):
         OMCSessionBase.__init__(self, readonly)
         self._create_omc_log_file("objid")
         # set omc executable path and args
         self._set_omc_command(self._get_omc_path(), "--interactive=corba +c={0}".format(self._random_string))
         # start up omc executable, which is waiting for the CORBA connection
         self._start_omc_process()
         # connect to the running omc instance using CORBA
-        self._connect_to_omc()
+        self._connect_to_omc(timeout)
 
     def __del__(self):
         OMCSessionBase.__del__(self)
 
-    def _connect_to_omc(self):
+    def _connect_to_omc(self, timeout):
         # add OPENMODELICAHOME\lib\python to PYTHONPATH so python can load omniORB imports
         sys.path.append(os.path.join(self.omhome, 'lib', 'python'))
         # import the skeletons for the global module
@@ -429,7 +429,7 @@ def _connect_to_omc(self):
             attempts = 0
             while True:
                 if not os.path.isfile(self._ior_file):
-                    time.sleep(0.25)
+                    time.sleep(timeout)
                     attempts += 1
                     if attempts == 10:
                         name = self._omc_log_file.name
@@ -491,20 +491,20 @@ def sendExpression(self, command, parsed=True):
 
 class OMCSessionZMQ(OMCSessionBase):
 
-    def __init__(self, readonly=False):
+    def __init__(self, readonly=False, timeout = 0.25):
         OMCSessionBase.__init__(self, readonly)
         self._create_omc_log_file("port")
         # set omc executable path and args
         self._set_omc_command(self._get_omc_path(), "--interactive=zmq +z={0}".format(self._random_string))
         # start up omc executable, which is waiting for the CORBA connection
         self._start_omc_process()
         # connect to the running omc instance using CORBA
-        self._connect_to_omc()
+        self._connect_to_omc(timeout)
 
     def __del__(self):
         OMCSessionBase.__del__(self)
 
-    def _connect_to_omc(self):
+    def _connect_to_omc(self, timeout):
         # Locating and using the IOR
         if sys.platform == 'win32':
             self._port_file = "openmodelica.port." + self._random_string
@@ -519,7 +519,7 @@ def _connect_to_omc(self):
             attempts = 0
             while True:
                 if not os.path.isfile(self._port_file):
-                    time.sleep(0.25)
+                    time.sleep(timeout)
                     attempts += 1
                     if attempts == 10:
                         name = self._omc_log_file.name