Merge pull request #116 from marszub/closing_threads

Thread interrupt handling

Author: marszub

config/config/connectionConfig.json

@@ -0,0 +1,14 @@
+{
+  "server_ip": "0.0.0.0",
+  "server_port": 40000,
+  "public": true,
+  "my_ip_global": "0.0.0.0",
+  "my_port_global": 40001,
+  "my_ip_local": "0.0.0.0",
+  "my_port_local": 40001,
+  "max_connection_time": 5,
+  "progress_retry_time": 50,
+  "heart_beat_period": 5,
+  "heart_beat_lifetime": 50,
+  "thread_num": 2
+}

config/config/taskConfig.json

@@ -0,0 +1,7 @@
+{
+  "hash": "C2B35CFCEB4C9E310D37255AC70644A6",
+  "taskSize": 5000000,
+  "atomicTaskSize": 100000,
+  "maxStringLength": 8,
+  "characters": "0123456789ABCD"
+}

config/taskConfig.json

@@ -1,7 +1,7 @@
 {
-  "hash": "B59C67BF196A4758191E42F76670CEBA",
-  "taskSize": 1000000,
+  "hash": "C2B35CFCEB4C9E310D37255AC70644A6",
+  "taskSize": 5000000,
   "atomicTaskSize": 100000,
-  "maxStringLength": 7,
-  "characters": "012345678"
+  "maxStringLength": 8,
+  "characters": "0123456789ABCD"
 }

src/main/java/pl/edu/agh/calculationp2p/Main.java

@@ -124,6 +124,14 @@ public static void main(String[] args) {
         } catch (InterruptedException e) {
             Logger logger = LoggerFactory.getLogger("");
             logger.error(e.getMessage());
+
+            uiControllerThread.interrupt();
+            for (Thread thread :
+                    taskResolverThreads) {
+                thread.interrupt();
+            }
+            messageProcessorThread.interrupt();
+            schedulerThread.interrupt();
         }
 
     }

src/main/java/pl/edu/agh/calculationp2p/calculation/TaskResolver.java

@@ -26,6 +26,9 @@ public TaskResolver(TaskGiver taskGiver, CalculationTask calculationTask) {
     public void run() {
         Future<Optional<Integer>> task = taskGiver.getTaskAndReserve();
         while (true) {
+            if(Thread.interrupted())
+                return;
+
             while(!task.isReady()){
                 try {
                     sleep(sleepTime);
@@ -48,6 +51,8 @@ public void run() {
             CalculationTaskIterator iterator = calculationTask.getFragmentOfTheTask(taskId);
 
             while (iterator.hasNext()) {
+                if(Thread.interrupted())
+                    return;
                 if(observer.isReady())
                     break;
                 resultBuilder.performComputation(iterator.getNext());

src/main/java/pl/edu/agh/calculationp2p/state/UI/UIController.java

@@ -30,10 +30,15 @@ public void run() {
             if (lowerOSName.contains("window")) {
                 try {
                     new ProcessBuilder("cmd", "/c", "cls").inheritIO().start().waitFor();
-                } catch (IOException | InterruptedException e) {
+                } catch (IOException e) {
                     Logger logger = LoggerFactory.getLogger("");
                     logger.error(e.getMessage());
                 }
+                catch (InterruptedException e){
+                    Logger logger = LoggerFactory.getLogger("");
+                    logger.error(e.getMessage());
+                    return;
+                }
             } else {
                 System.out.print("\033[H\033[2J");
                 System.out.flush();
@@ -44,6 +49,7 @@ public void run() {
             } catch (InterruptedException e) {
                 Logger logger = LoggerFactory.getLogger("");
                 logger.error(e.getMessage());
+                return;
             }
 
         }