Skip to content

Commit 0009c5e

Browse files
elebras1elebras1
committed
fix string allocation
1 parent 5272328 commit 0009c5e

8 files changed

Lines changed: 83 additions & 16 deletions

File tree

‎examples/src/main/java/com/github/elebras1/flecs/examples/ComplexComponentExample.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.github.elebras1.flecs.examples;
2+
3+
import com.github.elebras1.flecs.Entity;
4+
import com.github.elebras1.flecs.Flecs;
5+
import com.github.elebras1.flecs.collection.EcsLongList;
6+
import com.github.elebras1.flecs.examples.components.Minister;
7+
8+
import java.time.LocalDate;
9+
import java.time.format.DateTimeFormatter;
10+
11+
public class ComplexComponentExample {
12+
13+
public static void main(String[] args) {
14+
15+
int N = 100_000;
16+
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
17+
18+
Flecs world = new Flecs();
19+
world.component(Minister.class);
20+
21+
long start = System.currentTimeMillis();
22+
EcsLongList entityIds = new EcsLongList();
23+
24+
for (int i = 0; i < N; i++) {
25+
long id = world.entity();
26+
Entity e = world.obtainEntity(id);
27+
entityIds.add(id);
28+
29+
int startDate = (int) LocalDate.parse("1950-01-01", dateFormatter).plusDays(i).toEpochDay();
30+
int endDate = startDate + 365;
31+
32+
e.set(new Minister("Minister_" + i, "TAG_" + i, 1.0f, startDate, endDate));
33+
}
34+
35+
long creationEnd = System.currentTimeMillis();
36+
37+
for (long id : entityIds) {
38+
Entity e = world.obtainEntity(id);
39+
System.out.println(e.get(Minister.class));
40+
}
41+
42+
long end = System.currentTimeMillis();
43+
44+
System.out.println("Creation of " + N + " entities: " + (creationEnd - start) + " ms");
45+
System.out.println("Creation + reads: " + (end - start) + " ms");
46+
47+
world.close();
48+
}
49+
}

‎examples/src/main/java/com/github/elebras1/flecs/examples/components/Minister.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.github.elebras1.flecs.examples.components;
2+
3+
import com.github.elebras1.flecs.annotation.FlecsComponent;
4+
5+
@FlecsComponent
6+
public record Minister(String name, String imageFileName, float loyalty, int startDate, int deathDate) {
7+
}

‎src/main/java/com/github/elebras1/flecs/Component.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public interface Component<T> {
77

88
MemoryLayout layout();
99

10-
void write(MemorySegment segment, T data);
10+
void write(MemorySegment segment, T data, Flecs world);
1111

1212
T read(MemorySegment segment);
1313

‎src/main/java/com/github/elebras1/flecs/ComponentHooks.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class ComponentHooks<T> {
1111
private final Linker linker;
12-
private final Arena arena;
12+
private final Flecs world;
1313
private final Component<T> component;
1414
private IterHookCallback<T> onAddCallback;
1515
private IterHookCallback<T> onSetCallback;
@@ -24,7 +24,7 @@ public class ComponentHooks<T> {
2424

2525
public ComponentHooks(Flecs world, Component<T> component) {
2626
this.linker = Linker.nativeLinker();
27-
this.arena = world.arena();
27+
this.world = world;
2828
this.component = component;
2929
}
3030

@@ -108,7 +108,7 @@ private MemorySegment createIterHookStub(IterHookCallback<T> callback) {
108108

109109
MethodHandle target = MethodHandles.lookup().bind(this, "invokeIterHook", MethodType.methodType(void.class, IterHookCallback.class, MemorySegment.class)).bindTo(callback);
110110

111-
return this.linker.upcallStub(target, descriptor, this.arena);
111+
return this.linker.upcallStub(target, descriptor, this.world.arena());
112112
} catch (Exception e) {
113113
throw new RuntimeException("Failed to create iter hook stub", e);
114114
}
@@ -123,7 +123,7 @@ private MemorySegment createReplaceHookStub(ReplaceHookCallback<T> callback) {
123123

124124
MethodHandle target = MethodHandles.lookup().bind(this, "invokeReplaceHook", MethodType.methodType(void.class, ReplaceHookCallback.class, MemorySegment.class)).bindTo(callback);
125125

126-
return this.linker.upcallStub(target, descriptor, this.arena);
126+
return this.linker.upcallStub(target, descriptor, this.world.arena());
127127
} catch (Exception e) {
128128
throw new RuntimeException("Failed to create replace hook stub", e);
129129
}
@@ -138,7 +138,7 @@ private MemorySegment createXtorStub(XtorCallback<T> callback) {
138138

139139
MethodHandle target = MethodHandles.lookup().bind(this, "invokeXtorHook", MethodType.methodType(void.class, XtorCallback.class, MemorySegment.class, int.class, MemorySegment.class)).bindTo(callback);
140140

141-
return this.linker.upcallStub(target, descriptor, this.arena);
141+
return this.linker.upcallStub(target, descriptor, this.world.arena());
142142
} catch (Exception e) {
143143
throw new RuntimeException("Failed to create xtor hook stub", e);
144144
}
@@ -153,7 +153,7 @@ private MemorySegment createCopyMoveStub(CopyMoveCallback<T> callback) {
153153

154154
MethodHandle target = MethodHandles.lookup().bind(this, "invokeCopyMoveHook", MethodType.methodType(void.class, CopyMoveCallback.class, MemorySegment.class, MemorySegment.class, int.class, MemorySegment.class)).bindTo(callback);
155155

156-
return this.linker.upcallStub(target, descriptor, this.arena);
156+
return this.linker.upcallStub(target, descriptor, this.world.arena());
157157
} catch (Exception e) {
158158
throw new RuntimeException("Failed to create copy/move hook stub", e);
159159
}
@@ -263,7 +263,7 @@ private void writeComponentArray(MemorySegment ptr, T[] components, int count) {
263263
for (int i = 0; i < count; i++) {
264264
if (components[i] != null) {
265265
MemorySegment componentSegment = buffer.asSlice(i * size, size);
266-
this.component.write(componentSegment, components[i]);
266+
this.component.write(componentSegment, components[i], this.world);
267267
}
268268
}
269269
}

‎src/main/java/com/github/elebras1/flecs/Entity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public <T> Entity set(T data) {
115115
Component<T> component = this.world.componentRegistry().getComponent(componentClass);
116116

117117
MemorySegment dataSegment = this.world.getComponentBuffer(component.size());
118-
component.write(dataSegment, data);
118+
component.write(dataSegment, data, this.world);
119119
flecs_h.ecs_set_id(this.world.nativeHandle(), this.id, componentId, component.size(), dataSegment);
120120

121121
return this;

‎src/main/java/com/github/elebras1/flecs/Flecs.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ MemorySegment nativeHandle() {
667667
return this.nativeWorld;
668668
}
669669

670-
Arena arena() {
670+
public Arena arena() {
671671
return this.arena;
672672
}
673673

‎src/main/java/com/github/elebras1/flecs/processor/ComponentCodeGenerator.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,18 @@ private MethodSpec createWriteMethod(String recordName, List<VariableElement> fi
103103
.addAnnotation(Override.class)
104104
.addModifiers(Modifier.PUBLIC)
105105
.addParameter(MemorySegment.class, "segment")
106-
.addParameter(TypeVariableName.get(recordName), "data");
106+
.addParameter(TypeVariableName.get(recordName), "data")
107+
.addParameter(ClassName.get("com.github.elebras1.flecs", "Flecs"), "world"); // AJOUTER
107108

108109
for (VariableElement field : fields) {
109110
String fieldName = field.getSimpleName().toString();
110111
String offsetName = "OFFSET_" + fieldName.toUpperCase();
111-
method.addStatement("$L.set(segment, $L, data.$L())", LAYOUT_FIELD_CLASS, offsetName, fieldName);
112+
String typeName = field.asType().toString();
113+
if ("java.lang.String".equals(typeName)) {
114+
method.addStatement("$L.set(segment, $L, data.$L(), world)", LAYOUT_FIELD_CLASS, offsetName, fieldName);
115+
} else {
116+
method.addStatement("$L.set(segment, $L, data.$L())", LAYOUT_FIELD_CLASS, offsetName, fieldName);
117+
}
112118
}
113119

114120
return method.build();

‎src/main/java/com/github/elebras1/flecs/util/LayoutField.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.elebras1.flecs.util;
22

3-
import java.lang.foreign.Arena;
3+
import com.github.elebras1.flecs.Flecs;
4+
45
import java.lang.foreign.MemoryLayout;
56
import java.lang.foreign.MemorySegment;
67
import java.lang.foreign.ValueLayout;
@@ -61,9 +62,13 @@ public static void set(MemorySegment segment, long offset, boolean value) {
6162
segment.set(ValueLayout.JAVA_BOOLEAN, offset, value);
6263
}
6364

64-
public static void set(MemorySegment segment, long offset, String value) {
65-
MemorySegment stringSegment = value == null ? MemorySegment.NULL : Arena.ofAuto().allocateFrom(value);
66-
segment.set(ValueLayout.ADDRESS, offset, stringSegment);
65+
public static void set(MemorySegment segment, long offset, String value, Flecs world) {
66+
if (value == null) {
67+
segment.set(ValueLayout.ADDRESS, offset, MemorySegment.NULL);
68+
} else {
69+
MemorySegment stringSegment = world.arena().allocateFrom(value);
70+
segment.set(ValueLayout.ADDRESS, offset, stringSegment);
71+
}
6772
}
6873

6974
public static float getFloat(MemorySegment segment, long offset) {

0 commit comments

Comments
 (0)