Merge pull request #189 from pixxelhq/master

v5.10.9-Pixxel-7.0.0
pixxelhq · Jan 7, 2025 · edc5c12 · edc5c12
2 parents 156d878 + 162caad
commit edc5c12
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 66 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>

diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>cascading</artifactId>

diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>pus</artifactId>

diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>replication1</artifactId>

diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>replication2</artifactId>

diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>replication3</artifactId>

diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>simulation</artifactId>

diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>snippets</artifactId>

diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>templates</artifactId>

diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.9-Pixxel-6.4.1</version>
+	<version>5.10.9-Pixxel-7.0.0</version>
 
 	<packaging>pom</packaging>
 

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>simulator</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.9-Pixxel-6.4.1</version>
+		<version>5.10.9-Pixxel-7.0.0</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-6.4.1</version>
+    <version>5.10.9-Pixxel-7.0.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/ccsds/VcTmPacketHandler.java b/yamcs-core/src/main/java/org/yamcs/tctm/ccsds/VcTmPacketHandler.java
@@ -85,7 +85,7 @@ public class VcTmPacketHandler implements TmPacketDataLink, VcDownlinkHandler, S
     private Parameter spDataInCount, spDataInRate, vcDelta;
 
     // List of published vcDelta's
-    private ArrayList<ParameterValue> vcDeltas = new ArrayList<>();    
+    private ArrayList<ParameterValue> vcDeltas = new ArrayList<>(1);    
 
 
     public VcTmPacketHandler(String yamcsInstance, String name, VcDownlinkManagedParameters vmp) {
@@ -120,7 +120,7 @@ public VcTmPacketHandler(String yamcsInstance, String name, VcDownlinkManagedPar
         }
     }
 
-    public synchronized void publishVcDelta(long prevCount, long currentCount, int vcDifference) throws InterruptedException {
+    public void publishVcDelta(long prevCount, long currentCount, int vcDifference) {
         long time = timeService.getMissionTime();
         AggregateValue v = new AggregateValue(vcDeltaType.getMemberNames());
 
@@ -133,10 +133,6 @@ public synchronized void publishVcDelta(long prevCount, long currentCount, int v
         pv.setAcquisitionStatus(AcquisitionStatus.ACQUIRED);
         pv.setEngValue(v);
 
-        while (Thread.holdsLock(vcDeltas)) {
-            wait();
-        }
-
         vcDeltas.add(pv);
     }
 
@@ -152,12 +148,20 @@ public void handle(DownlinkTransferFrame frame) {
         lastFrameSeq = frame.getVcFrameSeq();
 
         // Publish the vcDelta
-        try {
-            if (frameLoss != 0)
+        synchronized (vcDeltas) {
+            if (frameLoss != 0) {
+                while (vcDeltas.size() == 1) {
+                    // Wait till consumed
+                    try {
+                        vcDeltas.wait();
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        log.error("Interrupted while waiting for vcDeltas to be consumed", e);
+                    }
+                }
+                // Produce the vcDelta
                 publishVcDelta(prevFrameSeq, lastFrameSeq, frameLoss);
-
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
+            }
         }
 
         if (frame.containsOnlyIdleData()) {
@@ -450,11 +454,9 @@ public void setupSystemParameters(SystemParametersService sysParamService) {
     }
 
 
-    public synchronized void consumeVcDelta(List<ParameterValue> list) throws InterruptedException {
+    public void consumeVcDelta(List<ParameterValue> list) {
         list.addAll(vcDeltas);
         vcDeltas.clear();
-
-        notify();
     }
 
     @Override
@@ -463,13 +465,11 @@ public Collection<ParameterValue> getSystemParameters(long time) {
         try {
             collectSystemParameters(time, list);
             synchronized (vcDeltas) {
-                if (!vcDeltas.isEmpty())
+                if (!vcDeltas.isEmpty()) {
                     consumeVcDelta(list);
+                    vcDeltas.notify();
+                }
             }
-
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-
         } catch (Exception e) {
             log.error("Exception caught when collecting link system parameters", e);
         }

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java
@@ -67,7 +67,7 @@ public SubServiceTen(String yamcsInstance, YConfiguration config) {
 
         try {
             for (Map.Entry<Integer, String> folderN: folders.entrySet())
-                timetagScheduleDetailReportBucket.putObject(yamcsInstance + "/timetagScheduleDetailReport/" + folderN.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
+                timetagScheduleDetailReportBucket.putObject("timetagScheduleDetailReport/" + folderN.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
 
         } catch (IOException e) {
             log.error("Unable to create a directory `" + timetagScheduleDetailReportBucket.getName() + "/timetagScheduleDetailReport` for (Service - 11 | SubService - 10)", e);
@@ -100,7 +100,7 @@ public ArrayList<byte[]> generateTimetagScheduleDetailReport(long gentime, Map<L
         Map<String, String> metadata;
 
         if (foundObject == null) {
-            filename = yamcsInstance + "/timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
+            filename = "timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
                 Instant.ofEpochSecond(gentime),
                 ZoneId.of("GMT")
             ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";
@@ -239,7 +239,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
         try {
             foundObject = findObject(uniqueSignature);
             if (foundObject == null) {
-                String filename = yamcsInstance + "/timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
+                String filename = "timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
                     Instant.ofEpochSecond(generationTime),
                     ZoneId.of("GMT")
                 ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java
@@ -66,7 +66,7 @@ public SubServiceThirteen(String yamcsInstance, YConfiguration config) {
 
         try {
             for (Map.Entry<Integer, String> folderN: folders.entrySet())
-                timetagScheduleSummaryReportBucket.putObject(yamcsInstance + "/timetagScheduleSummaryReport/" + folderN.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
+                timetagScheduleSummaryReportBucket.putObject("timetagScheduleSummaryReport/" + folderN.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
 
         } catch (IOException e) {
             log.error("Unable to create a directory `" + timetagScheduleSummaryReportBucket.getName() + "/timetagScheduleSummaryReport` for (Service - 11 | SubService - 13)", e);
@@ -99,7 +99,7 @@ public void generateTimetagScheduleSummaryReport(long gentime, Map<Long, ArrayLi
         Map<String, String> metadata;
 
         if (foundObject == null) {
-            filename = yamcsInstance + "/timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
+            filename = "timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
                 Instant.ofEpochSecond(gentime),
                 ZoneId.of("GMT")
             ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";
@@ -232,7 +232,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
             ObjectProperties foundObject = findObject(uniqueSignature);
 
             if (foundObject == null) {
-                String filename = yamcsInstance + "/timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
+                String filename = "timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant(
                     Instant.ofEpochSecond(generationTime),
                     ZoneId.of("GMT")
                 ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java
@@ -73,7 +73,7 @@ public SubServiceNineteen(String yamcsInstance, YConfiguration config) {
         packetStoreStatusReportBucket = PusTmManager.reports;
 
         try {
-            packetStoreStatusReportBucket.putObject(yamcsInstance + "/packetStoreStatusReport/", "application/octet-stream", new HashMap<>(), new byte[0]);
+            packetStoreStatusReportBucket.putObject("packetStoreStatusReport/", "application/octet-stream", new HashMap<>(), new byte[0]);
 
         } catch (IOException e) {
             log.error("Unable to create a directory `" + packetStoreStatusReportBucket.getName() + "/packetStoreStatusReport` for (Service - 15 | SubService - 19)", e);
@@ -88,7 +88,7 @@ public PreparedCommand process(PreparedCommand telecommand) {
 
     public void generatePacketStoredStatusReport(long generationTime, Map<Integer, byte[]> packetStoreReportMap) {
         long missionTime = PusTmManager.timeService.getMissionTime();
-        String filename = yamcsInstance + "/packetStoreStatusReport/" + LocalDateTime.ofInstant(
+        String filename = "packetStoreStatusReport/" + LocalDateTime.ofInstant(
             Instant.ofEpochSecond(generationTime),
             ZoneId.of("GMT")
         ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java
@@ -64,7 +64,7 @@ public SubServiceThirteen(String yamcsInstance, YConfiguration config) {
 
         try {
             for (Map.Entry<Integer, String> folder: packetStoreMap.entrySet())
-                packetStoreSummaryReportBucket.putObject(yamcsInstance + "/packetStoreSummaryReport/" + folder.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
+                packetStoreSummaryReportBucket.putObject("packetStoreSummaryReport/" + folder.getValue() + "/", "application/octet-stream", new HashMap<>(), new byte[0]);
 
         } catch (IOException e) {
             log.error("Unable to create a directory `" + packetStoreSummaryReportBucket.getName() + "/packetStoreSummaryReport` for (Service - 15 | SubService - 13)", e);
@@ -88,7 +88,7 @@ public void generatePacketStoredSummaryReport(long generationTime, Map<Integer,
         ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")));
 
         for (Map.Entry<Integer, byte[]> packetStoreReport: packetStoreReportMap.entrySet()) {
-            String filename = yamcsInstance + "/packetStoreSummaryReport/" + packetStoreMap.get(packetStoreReport.getKey()) + "/" + LocalDateTime.ofInstant(
+            String filename = "packetStoreSummaryReport/" + packetStoreMap.get(packetStoreReport.getKey()) + "/" + LocalDateTime.ofInstant(
                 Instant.ofEpochSecond(generationTime),
                 ZoneId.of("GMT")
             ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java
@@ -64,7 +64,7 @@ public SubServiceNine(String yamcsInstance, YConfiguration subServiceSixConfig)
         physicalDeviceReportBucket = PusTmManager.reports;
 
         try {
-            physicalDeviceReportBucket.putObject(yamcsInstance + "/physicalDeviceReport/", "application/octet-stream", new HashMap<>(), new byte[0]);
+            physicalDeviceReportBucket.putObject("physicalDeviceReport/", "application/octet-stream", new HashMap<>(), new byte[0]);
 
         } catch (IOException e) {
             log.error("Unable to create a directory `" + physicalDeviceReportBucket.getName() + "/physicalDeviceReport` for (Service - 2 | SubService - 9)", e);
@@ -92,7 +92,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
         long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength);
         long missionTime = PusTmManager.timeService.getMissionTime();
 
-        String filename = yamcsInstance + "/physicalDeviceReport/" + LocalDateTime.ofInstant(
+        String filename = "physicalDeviceReport/" + LocalDateTime.ofInstant(
             Instant.ofEpochSecond(generationTime),
             ZoneId.of("GMT")
         ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".json";