the name server is now correctly shutdowned

the Test fake analysis now does real computation for better modelling

Src/Framework/Jobs/IJob.py

@@ -140,13 +140,15 @@ class IJob(Configurable):
         # Otherwise, start a new one.        
         except Pyro.errors.NamingError:
             
-            subprocess.Popen([sys.executable, '-O', '-c', "import Pyro.naming; Pyro.naming.main([])"], stdout = subprocess.PIPE)
+            p = subprocess.Popen([sys.executable, '-O', '-c', "import Pyro.naming; Pyro.naming.main([])"], stdout = subprocess.PIPE)
             ns = None
             while ns is None:
                 try:
                     ns = locator.getNS()
                 except Pyro.errors.NamingError:
                     pass
+            return p
+        
                             
     @property
     def name(self):
@@ -261,7 +263,7 @@ class IJob(Configurable):
         
     def _run_remote(self):
 
-        IJob.set_pyro_server()
+        self._pyro_process = IJob.set_pyro_server()
 
         import MDANSE.DistributedComputing.MasterSlave as MasterSlave
 
@@ -279,14 +281,16 @@ class IJob(Configurable):
             _, _, (idx, x) = tasks.retrieveResult("run_step")
             self.combine(idx, x)
 
-        if self._status is not None:
-            if self._status.is_stopped():
-                self._status.cleanup()
-                return
-            else:
-                self._status.update()
+            if self._status is not None:
+                if self._status.is_stopped():
+                    self._status.cleanup()
+                    break
+                else:
+                    self._status.update()
 
         tasks.shutdown()
+
+        self._pyro_process.terminate()
  
     _runner = {"monoprocessor" : _run_monoprocessor, "multiprocessor" : _run_multiprocessor, "remote" : _run_remote}
 

Src/Framework/Jobs/Test.py

@@ -44,6 +44,8 @@ class Test(IJob):
         self.numberOfSteps = self.configuration['n_steps']['value']
 
         self.results = numpy.zeros((5,5),dtype=numpy.int)
+
+        self._matrix = numpy.random.uniform(0,10,(8000,8000))
                         
 
     def run_step(self, index):
@@ -57,7 +59,7 @@ class Test(IJob):
             #. atomicMSD (numpy.array): The calculated mean square displacement for atom index
         """
                
-        time.sleep(self.configuration['sleep']['value'])
+        inv = numpy.linalg.inv(self._matrix)
 
         return index, None