From 7882dbc1075981e88e8ad63e219678f18e9be5ad Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@nps.edu> Date: Sun, 30 Apr 2023 12:31:46 -0700 Subject: [PATCH] comment out obsolete mutex classes, not part of latest java and no longer very useful technique --- ...BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java | 76 +++++++++---------- ...BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java | 48 ++++++------ 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java index 04f00cadb5..39d47d0ea7 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java @@ -1,6 +1,6 @@ package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann; -import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8 +//import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8 // obsolete, undesirable approach // TODO JDK 13? // maybe https://crunchify.com/what-is-java-semaphore-and-mutex-java-concurrency-multithread-explained-with-example/ import java.net.*; @@ -20,7 +20,7 @@ public class BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver extends Thread static final boolean USE_FAST_ESPDU = false; static List<Integer> savedMCASTMessages = new ArrayList(); static List<Pdu> mcastMessagesToSend = new ArrayList(); - static Mutex mutex = new Mutex(); +// static Mutex mutex = new Mutex(); // obsolete, undesirable approach static boolean keepRunning = false; static boolean isRunning = false; @@ -52,19 +52,19 @@ public class BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver extends Thread System.out.println("BRE_KNO_MCC_PC1_MCAST received Massage."); savedMCASTMessages.add(pdu.getTimestamp()); - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach System.out.println("PC2 - PC1 received: Internal ID " + pdu.getTimestamp() + " added."); mcastMessagesToSend.add(pdu); - mutex.release(); +// mutex.release(); // obsolete, undesirable approach System.out.println("Added to SendList and saved in archiv."); - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); - } +// } +// catch (InterruptedException ex) // obsolete, undesirable approach +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); +// } } else { @@ -117,46 +117,46 @@ public class BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver extends Thread public void resetSavedMCASTMessagesList() { - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach savedMCASTMessages.clear(); - mutex.release(); - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); - } +// mutex.release(); +// } +// catch (InterruptedException ex) +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); +// } } public void resetMcastMessagesToSend() { - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach mcastMessagesToSend.clear(); - mutex.release(); - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); - } +// mutex.release(); // obsolete, undesirable approach +// } +// catch (InterruptedException ex) +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); +// } } public List<Pdu> getMCASTMessagesToSend() { List<Pdu> temp = null; - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach temp = new ArrayList(mcastMessagesToSend); mcastMessagesToSend.clear(); - mutex.release(); - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); - } +// mutex.release(); // obsolete, undesirable approach +// } +// catch (InterruptedException ex) // obsolete, undesirable approach +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.class.getName()).log(Level.SEVERE, null, ex); +// } return temp; } } diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java index d8ba38d744..d705d2c5d7 100755 --- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java @@ -1,6 +1,6 @@ package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann; -import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8 +//import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8 // obsolete, undesirable approach // TODO JDK 13? // maybe https://crunchify.com/what-is-java-semaphore-and-mutex-java-concurrency-multithread-explained-with-example/ import java.util.*; @@ -19,7 +19,7 @@ import java.util.logging.Logger; public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread { - static Mutex mutex = new Mutex(); +// static Mutex mutex = new Mutex(); // obsolete, undesirable approach static List<Pdu> messagesToSend = new ArrayList(); static boolean keepRunning = false; static boolean isRunning = false; @@ -37,14 +37,14 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread while (keepRunning) { - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach if (!messagesToSend.isEmpty()) { Pdu tempPdu = messagesToSend.get(0); messagesToSend.remove(messagesToSend.get(0)); - mutex.release(); +// mutex.release(); // obsolete, undesirable approach if (tempPdu.getPduType() != DisPduType.COMMENT) { @@ -78,16 +78,16 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread } } } - else - { - mutex.release(); - } - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.class.getName()).log(Level.SEVERE, null, ex); +// else +// { +// mutex.release(); // obsolete, undesirable approach +// } } - } +// catch (InterruptedException ex) +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.class.getName()).log(Level.SEVERE, null, ex); +// } +// } } catch (SocketException ex) { @@ -113,19 +113,19 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread public void setListToSend(List<Pdu> pduSetToSend) { - try - { - mutex.acquire(); +// try // obsolete, undesirable approach +// { +// mutex.acquire(); // obsolete, undesirable approach while (!pduSetToSend.isEmpty()) { messagesToSend.add(pduSetToSend.get(0)); pduSetToSend.remove(0); } - mutex.release(); - } - catch (InterruptedException ex) - { - Logger.getLogger(BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.class.getName()).log(Level.SEVERE, null, ex); - } +// mutex.release(); // obsolete, undesirable approach +// } +// catch (InterruptedException ex) +// { +// Logger.getLogger(BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.class.getName()).log(Level.SEVERE, null, ex); +// } } } -- GitLab