nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-21 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronizing object packing

Browse Source 
Synchronize object packing between the binary store and the network
sender since we're having trouble with these two users of data
overwriting each others work in progress.
This commit is contained in:
Douglas Gillespie 2023-02-07 17:35:01 +00:00
parent ac004ab9cc
commit e4c4c95340
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/binaryFileStorage/BinaryDataSource.java
View File

@ -41,6 +41,8 @@ public abstract class BinaryDataSource {
private boolean saveUpdates = false;
private BackgroundBinaryWriter backgroundBinaryWriter;
public static final Object packSynchObject = new Object();
/**
* Create a binary data source. These are used both to store data in binary
@ -224,11 +226,13 @@ public abstract class BinaryDataSource {
* Then pack the data
*/
BinaryObjectData data;
if (pamDataUnit instanceof BackgroundDataUnit) {
data = getBackgroundBinaryWriter().packBackgroundData((BackgroundDataUnit) pamDataUnit);
}
else {
data = getPackedData(pamDataUnit);
synchronized (packSynchObject) {
if (pamDataUnit instanceof BackgroundDataUnit) {
data = getBackgroundBinaryWriter().packBackgroundData((BackgroundDataUnit) pamDataUnit);
}
else {
data = getPackedData(pamDataUnit);
}
}
/*
* Then put it back to how it was a moment ago.

5
src/networkTransfer/send/NetworkObjectPacker.java
View File

@ -75,7 +75,10 @@ public class NetworkObjectPacker {
BinaryDataSource binarySource = dataBlock.getBinaryDataSource();
int dataType2 = dataBlock.getQuickId();
BinaryObjectData packedObject = binarySource.getPackedData(dataUnit);
BinaryObjectData packedObject = null;
synchronized (BinaryDataSource.packSynchObject) {
packedObject = binarySource.getPackedData(dataUnit);
}
byte[] data = packedObject.getData();
int duDataLength = data.length + 12;
DataUnitBaseData baseData = dataUnit.getBasicData();