tmf/ctf: lower memory usage of events with fixed length strings

Change-Id: I87149b8cb1c94e8fea8a90801cd254d9c3dc02ea
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/32075
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Hudson CI

1 files changed, 17 insertions, 11 deletions

diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfEventField.java b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfEventField.java
index 34e1ae9548..0f2496f29f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfEventField.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfEventField.java
@@ -132,20 +132,26 @@ public abstract class CtfTmfEventField extends TmfEventField {
             Collection<Definition> definitions = arrayDef.getDefinitions();
             elemType = arrDecl.getElementType();
             if (elemType instanceof IntegerDeclaration) {
-                /* Array of integers => CTFIntegerArrayField */
+                /* Array of integers => CTFIntegerArrayField, unless it's a CTFStringField */
                 IntegerDeclaration elemIntType = (IntegerDeclaration) elemType;
-                long[] values = new long[arrayDef.getLength()];
-                for (int i = 0; i < arrayDef.getLength(); i++) {
-                    IDefinition elem = arrayDef.getDefinitions().get(i);
-                    if (elem == null) {
-                        break;
+                /* Are the integers characters and encoded? */
+                if (elemIntType.isCharacter()) {
+                    /* it's a CTFStringField */
+                    field = new CTFStringField(fieldName, arrayDef.toString());
+                } else {
+                    /* it's a CTFIntegerArrayField */
+                    long[] values = new long[arrayDef.getLength()];
+                    for (int i = 0; i < arrayDef.getLength(); i++) {
+                        IDefinition elem = arrayDef.getDefinitions().get(i);
+                        if (elem == null) {
+                            break;
+                        }
+                        values[i] = ((IntegerDefinition) elem).getValue();
                     }
-                    values[i] = ((IntegerDefinition) elem).getValue();
+                    field = new CTFIntegerArrayField(fieldName, values,
+                            elemIntType.getBase(),
+                            elemIntType.isSigned());
                 }
-                field = new CTFIntegerArrayField(fieldName, values,
-                        elemIntType.getBase(),
-                        elemIntType.isSigned());
-
             } else {
                 /* Arrays of elements of any other type */
                 CtfTmfEventField[] elements = new CtfTmfEventField[arrayDef.getLength()];