ctf: Use declared length as size for BlobDefinitions

Change-Id: I30afb71bbcf7ff688590b95b7f48caf53b9d3ed4
Signed-off-by: Matthew Khouzam <[email protected]>

Author: MatthewKhouzam

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

@@ -91,7 +91,7 @@ public long getAlignment() {
      */
     @Override
     public int getMaximumSize() {
-        return 1000000;
+        return Math.min(fLength, 1000000);
     }
 
     @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$
+
 }