From 16caa309f253bfd15742321cc114f6f991dd7712 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Wed, 25 Aug 2021 13:59:03 -0700
Subject: [PATCH] updated jars
---
.../OpenDis7Examples/AllPduReceiverLog.txt | 1 -
.../src/OpenDis7Examples/AllPduSenderLog.txt | 4 ++--
.../ExampleSimulationProgram.java | 10 +++++---
.../ExampleSimulationProgramLog.txt | 24 +++++++++++++++----
.../OpenDis7Examples/PduListenerSaverLog.txt | 16 +++++++------
.../OpenDis7Examples/PduReaderPlayerLog.txt | 9 +------
6 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/examples/src/OpenDis7Examples/AllPduReceiverLog.txt b/examples/src/OpenDis7Examples/AllPduReceiverLog.txt
index 9c9648192d..0117d11d49 100644
--- a/examples/src/OpenDis7Examples/AllPduReceiverLog.txt
+++ b/examples/src/OpenDis7Examples/AllPduReceiverLog.txt
@@ -83,4 +83,3 @@ To quit: stop or kill this process
16:00:00 received new DIS PDU DisPduType 70 INFORMATION_OPERATIONS_ACTION (DisPduType 13 INFORMATION_OPERATIONS)
16:00:00 received new DIS PDU DisPduType 71 INFORMATION_OPERATIONS_REPORT (DisPduType 13 INFORMATION_OPERATIONS)
16:00:00 received new DIS PDU DisPduType 72 ATTRIBUTE (DisPduType 1 ENTITY_INFORMATION_INTERACTION)
-BUILD STOPPED (total time: 33 seconds)
diff --git a/examples/src/OpenDis7Examples/AllPduSenderLog.txt b/examples/src/OpenDis7Examples/AllPduSenderLog.txt
index 6c83722650..30d936dd63 100644
--- a/examples/src/OpenDis7Examples/AllPduSenderLog.txt
+++ b/examples/src/OpenDis7Examples/AllPduSenderLog.txt
@@ -40,12 +40,12 @@ Sent packet #22, DisPduType 22 COMMENT (packet.getLen
Sent packet #23, DisPduType 23 ELECTROMAGNETIC_EMISSION (packet.getLength()= 28) of type edu.nps.moves.dis7.pdus.ElectromagneticEmissionPdu
Sent packet #24, DisPduType 24 DESIGNATOR (packet.getLength()= 88) of type edu.nps.moves.dis7.pdus.DesignatorPdu
Sent packet #25, DisPduType 25 TRANSMITTER (packet.getLength()=107) of type edu.nps.moves.dis7.pdus.TransmitterPdu
-Sent packet #26, DisPduType 26 SIGNAL (packet.getLength()= 36) of type edu.nps.moves.dis7.pdus.SignalPdu
+Sent packet #26, DisPduType 26 SIGNAL (packet.getLength()= 32) of type edu.nps.moves.dis7.pdus.SignalPdu
Sent packet #27, DisPduType 27 RECEIVER (packet.getLength()= 36) of type edu.nps.moves.dis7.pdus.ReceiverPdu
Sent packet #28, DisPduType 28 IDENTIFICATION_FRIEND_OR_FOE (packet.getLength()= 60) of type edu.nps.moves.dis7.pdus.IdentificationFriendOrFoePdu
Sent packet #29, DisPduType 29 UNDERWATER_ACOUSTIC (packet.getLength()= 32) of type edu.nps.moves.dis7.pdus.UnderwaterAcousticPdu
Sent packet #30, DisPduType 30 SUPPLEMENTAL_EMISSION_ENTITY_STATE (packet.getLength()= 28) of type edu.nps.moves.dis7.pdus.SupplementalEmissionEntityStatePdu
-Sent packet #31, DisPduType 31 INTERCOM_SIGNAL (packet.getLength()= 36) of type edu.nps.moves.dis7.pdus.IntercomSignalPdu
+Sent packet #31, DisPduType 31 INTERCOM_SIGNAL (packet.getLength()= 32) of type edu.nps.moves.dis7.pdus.IntercomSignalPdu
Sent packet #32, DisPduType 32 INTERCOM_CONTROL (packet.getLength()= 40) of type edu.nps.moves.dis7.pdus.IntercomControlPdu
Sent packet #33, DisPduType 33 AGGREGATE_STATE (packet.getLength()=136) of type edu.nps.moves.dis7.pdus.AggregateStatePdu
Sent packet #34, DisPduType 34 ISGROUPOF (packet.getLength()= 40) of type edu.nps.moves.dis7.pdus.IsGroupOfPdu
diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java
index 72ee85a261..ea8eb795cc 100644
--- a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java
+++ b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java
@@ -224,7 +224,9 @@ public class ExampleSimulationProgram
{
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation:" +
+ " address=" + disNetworkInterface.getAddress()+ // disNetworkInterface.getMulticastGroup() +
+ " port=" + disNetworkInterface.getPort()); // + disNetworkInterface.getDisPort());
pduListener = new DisThreadedNetworkInterface.PduListener()
{
/** Callback handler for listener */
@@ -241,8 +243,10 @@ public class ExampleSimulationProgram
public void tearDownNetworkInterface()
{
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
- disNetworkInterface = null;
+
+ disNetworkInterface.close();
+// disNetworkInterface.kill(); // renamed as close(), deprecated
+// disNetworkInterface = null; // making sure no possibility of zombie process remaining...
}
/**
diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt b/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
index 13c9f96360..e579ef4008 100644
--- a/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
+++ b/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
@@ -7,19 +7,22 @@ Compiling 1 source file to C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\buil
compile-single:
run-single:
[OpenDis7Examples.ExampleSimulationProgram] started...
-[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
Network confirmation: address=239.1.2.3 port=3000
Beginning pdu save to directory ./pduLog
-Recorder log file open: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
-[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
+Recorder log file open: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog20.dislog
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
class edu.nps.moves.dis7.utilities.stream.PduRecorder listening to IP address 239.1.2.3 on port 3000
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
sending PDUs for simulation step 1, monitor loopback to confirm sent
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. sent DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DisPduType 01 ENTITY_STATE, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. sent DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DisPduType 02 FIRE, size 96 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. sent DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DisPduType 22 COMMENT, size 104 bytes)
*** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 1]
@@ -27,10 +30,13 @@ sending PDUs for simulation step 1, monitor loopback to confirm sent
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
sending PDUs for simulation step 2, monitor loopback to confirm sent
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. sent DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DisPduType 01 ENTITY_STATE, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. sent DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DisPduType 02 FIRE, size 96 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. sent DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DisPduType 22 COMMENT, size 104 bytes)
*** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 2]
@@ -38,10 +44,13 @@ sending PDUs for simulation step 2, monitor loopback to confirm sent
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
sending PDUs for simulation step 3, monitor loopback to confirm sent
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. sent DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DisPduType 01 ENTITY_STATE, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. sent DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DisPduType 02 FIRE, size 96 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. sent DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DisPduType 22 COMMENT, size 104 bytes)
*** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 3]
@@ -49,31 +58,38 @@ sending PDUs for simulation step 3, monitor loopback to confirm sent
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
sending PDUs for simulation step 4, monitor loopback to confirm sent
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. sent DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. received DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. received DisPduType 01 ENTITY_STATE, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. sent DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. received DisPduType 22 COMMENT, size 104 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. sent DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. received DisPduType 22 COMMENT, size 104 bytes)
*** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 4]
... [PDUs successfully sent for this loop]
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
sending PDUs for simulation step 5, monitor loopback to confirm sent
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. sent DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. received DisPduType 01 ENTITY_STATE, size 144 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. received DisPduType 01 ENTITY_STATE, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. sent DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. received DisPduType 02 FIRE, size 96 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. received DisPduType 02 FIRE, size 96 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. sent DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. received DisPduType 22 COMMENT, size 104 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. received DisPduType 22 COMMENT, size 104 bytes)
*** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 5]
... [PDUs successfully sent for this loop]
... [Termination condition met, simulationComplete=true]
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 16. sent DisPduType 22 COMMENT, size 120 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 16. received DisPduType 22 COMMENT, size 120 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 16. received DisPduType 22 COMMENT, size 120 bytes)
*** [Narrative comment sent: COMPLETE_EVENT_REPORT] [MV3500 ExampleSimulationProgram, runSimulation() completed successfully]
... [final CommentPdu successfully sent for simulation]
-Closing recorder log file: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
+Closing recorder log file: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog20.dislog
[OpenDis7Examples.ExampleSimulationProgram] complete.
BUILD SUCCESSFUL (total time: 10 seconds)
diff --git a/examples/src/OpenDis7Examples/PduListenerSaverLog.txt b/examples/src/OpenDis7Examples/PduListenerSaverLog.txt
index 6ea0ec8395..e36724bfd1 100644
--- a/examples/src/OpenDis7Examples/PduListenerSaverLog.txt
+++ b/examples/src/OpenDis7Examples/PduListenerSaverLog.txt
@@ -23,8 +23,8 @@ compile-single:
run-single:
OpenDis7Examples.PduListenerSaver started...
Beginning PduListenerSaver (239.1.2.3:3000) to directory pduLog
-Recorder log file open: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
-[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
+Recorder log file open: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog21.dislog
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN
class edu.nps.moves.dis7.utilities.stream.PduRecorder listening to IP address 239.1.2.3 on port 3000
Type p/enter to pause, r/enter to resume, q/enter to quit
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DisPduType 01 ENTITY_STATE, size 144 bytes)
@@ -52,12 +52,12 @@ Type p/enter to pause, r/enter to resume, q/enter to quit
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 23. received DisPduType 23 ELECTROMAGNETIC_EMISSION, size 28 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 24. received DisPduType 24 DESIGNATOR, size 88 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 25. received DisPduType 25 TRANSMITTER, size 107 bytes)
-[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 26. received DisPduType 26 SIGNAL, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 26. received DisPduType 26 SIGNAL, size 32 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 27. received DisPduType 27 RECEIVER, size 36 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 28. received DisPduType 28 IDENTIFICATION_FRIEND_OR_FOE, size 60 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 29. received DisPduType 29 UNDERWATER_ACOUSTIC, size 32 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 30. received DisPduType 30 SUPPLEMENTAL_EMISSION_ENTITY_STATE, size 28 bytes)
-[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 31. received DisPduType 31 INTERCOM_SIGNAL, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 31. received DisPduType 31 INTERCOM_SIGNAL, size 32 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 32. received DisPduType 32 INTERCOM_CONTROL, size 40 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 33. received DisPduType 33 AGGREGATE_STATE, size 136 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 34. received DisPduType 34 ISGROUPOF, size 40 bytes)
@@ -99,10 +99,12 @@ Type p/enter to pause, r/enter to resume, q/enter to quit
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 70. received DisPduType 70 INFORMATION_OPERATIONS_ACTION, size 56 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 71. received DisPduType 71 INFORMATION_OPERATIONS_REPORT, size 40 bytes)
[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 72. received DisPduType 72 ATTRIBUTE, size 32 bytes)
+quit
+Type p/enter to pause, r/enter to resume, q/enter to quit
q
... QUIT
-Closing recorder log file: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
+Closing recorder log file: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog21.dislog
Ending PduListenerSaver pdu recording, saved to file:
-C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
-BUILD SUCCESSFUL (total time: 32 seconds)
+C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog21.dislog
+BUILD SUCCESSFUL (total time: 44 seconds)
diff --git a/examples/src/OpenDis7Examples/PduReaderPlayerLog.txt b/examples/src/OpenDis7Examples/PduReaderPlayerLog.txt
index 23dc83d789..045d885479 100644
--- a/examples/src/OpenDis7Examples/PduReaderPlayerLog.txt
+++ b/examples/src/OpenDis7Examples/PduReaderPlayerLog.txt
@@ -90,15 +90,8 @@ edu.nps.moves.dis7.utilities.stream.X3dSlidingWindowCompression.doSlidingWindow(
Insufficient keys to create X3D interpolators
edu.nps.moves.dis7.utilities.stream.X3dSlidingWindowCompression.doSlidingWindow() regression: localMap.size()=1
Insufficient keys to create X3D LineSet
-Replaying C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog1.dislog
-Total PDUs: 72 1...
-End of replay from PduCaptureLog1.dislog
-edu.nps.moves.dis7.utilities.stream.X3dSlidingWindowCompression.doSlidingWindow() regression: localMap.size()=1
-Insufficient keys to create X3D interpolators
-edu.nps.moves.dis7.utilities.stream.X3dSlidingWindowCompression.doSlidingWindow() regression: localMap.size()=1
-Insufficient keys to create X3D LineSet
q
... QUIT
Ending pdu files playback for directory pduLog
OpenDis7Examples.PduReaderPlayer complete.
-BUILD SUCCESSFUL (total time: 46 seconds)
+BUILD SUCCESSFUL (total time: 36 seconds)
--
GitLab