ctf: Use declared length as size for BlobDefinitions

Change-Id: I30afb71bbcf7ff688590b95b7f48caf53b9d3ed4
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/BlobDeclaration.java

@@ -63,9 +63,6 @@ public BlobDeclaration(int len, String mediaType, String role) {
 
     @Override
     public @NonNull BlobDefinition createDefinition(IDefinitionScope definitionScope, @NonNull String fieldName, @NonNull BitBuffer input) throws CTFException {
-        if (fLength > getMaximumSize()) {
-            throw new CTFException("Length asked: " + fLength + " is larger than the maximum blob size " + getMaximumSize()); //$NON-NLS-1$ //$NON-NLS-2$
-        }
         byte[] array = new byte[fLength];
         if (input.getByteBuffer().remaining() < fLength) {
             throw new CTFException("There is not enough data provided. Length asked: " + fLength + " Remaining buffer size: " + input.getByteBuffer().remaining()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -86,12 +83,9 @@ public long getAlignment() {
         return 8;
     }
 
-    /**
-     * Arbitrary decision to have maximum size as 1MB
-     */
     @Override
     public int getMaximumSize() {
-        return 1000000;
+        return fLength * 8; // This will allow the blob to be read properly and not break alignment in ctf.
     }
 
     @Override

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java

@@ -30,6 +30,8 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.types.StructDeclarationFlattener;
 import org.eclipse.tracecompass.internal.ctf.core.utils.JsonMetadataStrings;
 
+import com.google.gson.JsonElement;
+
 /**
  *
  * Structures are aligned on the largest alignment required by basic types
@@ -197,19 +199,18 @@ public StructDeclaration parse(ICTFMetadataNode struct, ICommonTreeParserParamet
                 structBody = struct;
             }
         } else if (struct instanceof JsonStructureFieldMemberMetadataNode) {
-            ICTFMetadataNode innerNode = struct.getChild(JsonMetadataStrings.STRUCT);
-            if (innerNode instanceof JsonStructureFieldMetadataNode) {
-                JsonStructureFieldMetadataNode structNode = (JsonStructureFieldMetadataNode) struct;
-                if (structNode.getMinimumAlignment() != 0) {
-                    structAlign = AlignmentParser.INSTANCE.parse(struct, null);
+            JsonStructureFieldMemberMetadataNode memberNode = (JsonStructureFieldMemberMetadataNode) struct;
+            if (memberNode.getFieldClass().isJsonObject()) {
+                JsonElement minimumAlignment = memberNode.getFieldClass().getAsJsonObject().get(JsonMetadataStrings.MINIMUM_ALIGNMENT);
+                if (minimumAlignment != null) {
+                    structAlign = minimumAlignment.getAsLong();
                 }
-                if (structNode.getMemberClasses() != null) {
+                JsonElement memberClasses = memberNode.getFieldClass().getAsJsonObject().get(JsonMetadataStrings.MEMBER_CLASSES);
+                if (memberClasses != null) {
                     hasBody = true;
                     structBody = struct;
-
                 }
             }
-
         }
         /*
          * If a struct has just a body and no name (just like the song,

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/utils/JsonMetadataStrings.java

@@ -237,4 +237,8 @@ private JsonMetadataStrings() {
      */
     public static final String ELEMENT_FIELD_CLASS = "element-field-class"; //$NON-NLS-1$
 
+    public static final String MEMBER_CLASSES = "member-classes"; //$NON-NLS-1$
+
+    public static final String MINIMUM_ALIGNMENT = "minimum-alignment"; //$NON-NLS-1$
+
 }