fixes missing process list

Author: benjione

eqsn/gates.py

@@ -20,15 +20,15 @@ def __init__(self):
         self.manager = multiprocessing.Manager()
         self.shared_dict = SharedDict.get_instance()
         cpu_count = multiprocessing.cpu_count()
-        process_queue_list = []
+        self.process_queue_list = []
         for _ in range(cpu_count):
             q = multiprocessing.Queue()
             new_worker = WorkerProcess(q)
             p = multiprocessing.Process(target=new_worker.run, args=())
             p.start()
-            process_queue_list.append((p, q))
+            self.process_queue_list.append((p, q))
         self.process_picker = ProcessPicker.get_instance(
-            cpu_count, process_queue_list)
+            cpu_count, self.process_queue_list)
 
     def new_qubit(self, q_id):
         """
@@ -46,8 +46,9 @@ def stop_all(self):
         """
         Stops the simulator from running.
         """
-        self.shared_dict.send_all_threads(None)
-        self.shared_dict.stop_all_threads()
+        for p, q in self.process_queue_list:
+            q.put(None)
+            p.join()
         self.shared_dict.stop_shared_dict()
         self.process_picker.stop_process_picker()
 

eqsn/worker_process.py

@@ -1,5 +1,6 @@
 import logging
 import threading
+import os
 from queue import Queue
 from eqsn.shared_dict import SharedDict
 from eqsn.qubit_thread import SINGLE_GATE, MERGE_SEND, MERGE_ACCEPT, MEASURE,\
@@ -36,7 +37,7 @@ def run(self):
             elif item[0] == MERGE_ACCEPT:
                 self.merge_accept(item[1], item[2])
             elif item[0] == MERGE_SEND:
-                self.merge_send(item[1], item[2])
+                self.merge_send(item[1], item[2], item[3])
             elif item[0] == MEASURE_NON_DESTRUCTIVE:
                 self.measure_non_destructive(item[1], item[2])
             elif item[0] == ADD_MERGED_QUBITS_TO_DICT:

tests/test_merging_qubits.py

@@ -9,6 +9,7 @@ def test_merge():
     q_sim.new_qubit(id2)
     q_sim.merge_qubits(id1, id2)
     q_sim.stop_all()
+    print("merging was succesfull")
 
 
 if __name__ == "__main__":

tests/test_non_destructive_measurement.py

@@ -12,6 +12,8 @@ def test_non_destructive_measurement():
     assert m == m2
     print("Test was successfull!")
     q_sim.stop_all()
+    print("Stopped succesfully!")
+    exit(0)
 
 
 if __name__ == "__main__":