13593874277

Committed 28 Feb 2025 06:06PM CUT coverage: 96.872% (+2.1%) from 94.795%

Build # 13593874277

Build Type

Pull #79

github

Committed by

web-flow

Commit Message

Merge 94da96c6d into 10315654e

Pull Request Pull Request #79: Relation getters for queries and maps

Run Details

118 of 118 new or added lines in 6 files covered. (100.0%)

8 existing lines in 1 file now uncovered.

3562 of 3677 relevant lines covered (96.87%)

50530.93 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

96.12

/ecs/column.go

package ecs

import (
        "reflect"
        "unsafe"
)

// column storage for components in an archetype.
type column struct {
        data       reflect.Value
        pointer    unsafe.Pointer
        isRelation bool
        target     Entity
        itemSize   uintptr
        len        uint32
}

// newColumn creates a new column for a given type and capacity.
func newColumn(tp reflect.Type, isRelation bool, target Entity, capacity uint32) column {
        // TODO: should be use a slice instead of an array here?
        data := reflect.New(reflect.ArrayOf(int(capacity), tp)).Elem()
        pointer := data.Addr().UnsafePointer()

        return column{
                data:       data,
                pointer:    pointer,
                itemSize:   sizeOf(tp),
                isRelation: isRelation,
                target:     target,
                len:        0,
        }
}

// Len returns the number of components in the column.
func (c *column) Len() int {
        return int(c.len)
}

// Cap returns the current capacity of the column.
func (c *column) Cap() int {
        return c.data.Cap()
}

// Get returns a pointer to the component at the given index.
func (c *column) Get(index uintptr) unsafe.Pointer {
        return unsafe.Add(c.pointer, index*c.itemSize)
}

// Add adds a component to the column.
func (c *column) Add(comp unsafe.Pointer) (unsafe.Pointer, uint32) {
        c.Extend(1)
        c.len++
        return c.Set(c.len-1, comp), c.len - 1
}

// Alloc allocates memory for the given number of components.
func (c *column) Alloc(n uint32) {
        c.Extend(n)
        c.len += n
}

func (c *column) AddAll(other *column) {
        oldLen := c.len
        c.Alloc(other.len)
        src := other.Get(0)
        dst := c.Get(uintptr(oldLen))
        copyPtr(src, dst, c.itemSize*uintptr(other.len))
}

// Set overwrites the component at the given index.
func (c *column) Set(index uint32, comp unsafe.Pointer) unsafe.Pointer {
        dst := c.Get(uintptr(index))
        if c.itemSize == 0 {
                return dst
        }

        copyPtr(comp, dst, uintptr(c.itemSize))
        return dst
}

// Remove swap-removes the component at the given index.
// Returns whether a swap was necessary.
func (c *column) Remove(index uint32, zero unsafe.Pointer) bool {
        lastIndex := uintptr(c.len - 1)
        swapped := index != uint32(lastIndex)

        if swapped && c.itemSize != 0 {
                src := unsafe.Add(c.pointer, lastIndex*c.itemSize)
                dst := unsafe.Add(c.pointer, uintptr(index)*c.itemSize)
                copyPtr(src, dst, uintptr(c.itemSize))
        }
        c.len--
        if zero != nil {
                c.Zero(lastIndex, zero)
        }
        return swapped
}

// Extend the column to be able to store the given number of additional components.
// Has no effect of the column's capacity is already sufficient.
// If the capacity needs to be increased, it will be doubled until it is sufficient.
func (c *column) Extend(by uint32) {
        required := c.Len() + int(by)
        cap := c.Cap()
        if cap >= required {
                return
        }
        for cap < required {
                cap *= 2
        }
        old := c.data
        c.data = reflect.New(reflect.ArrayOf(cap, old.Type().Elem())).Elem()
        c.pointer = c.data.Addr().UnsafePointer()
        reflect.Copy(c.data, old)
}

// Zero resets the memory at the given index.
func (c *column) Zero(index uintptr, zero unsafe.Pointer) {
        if c.itemSize == 0 {
                return
        }
        dst := unsafe.Add(c.pointer, index*c.itemSize)
        copyPtr(zero, dst, uintptr(c.itemSize))
}

// Zero resets a block of storage in one buffer.
func (c *column) ZeroRange(start, len uint32, zero unsafe.Pointer) {
        size := uint32(c.itemSize)
        if size == 0 {
                return
        }
        var i uint32
        for i = 0; i < len; i++ {
                dst := unsafe.Add(c.pointer, (i+start)*size)
                copyPtr(zero, dst, c.itemSize)
        }
}

func (c *column) Reset(zero unsafe.Pointer) {
        len := c.len
        if c.len == 0 {
                return
        }
        c.len = 0
        if zero == nil {
                return
        }
        if len <= 64 { // A coarse estimate where manually zeroing is faster
                c.ZeroRange(0, len, zero)
        } else {
                c.data.SetZero()
        }
}

1	package ecs
2
3	import (
4	"reflect"
5	"unsafe"
6	)
7
8	// column storage for components in an archetype.
9	type column struct {
10	data reflect.Value
11	pointer unsafe.Pointer
12	isRelation bool
13	target Entity
14	itemSize uintptr
15	len uint32
16	}
17
18	// newColumn creates a new column for a given type and capacity.
19	func newColumn(tp reflect.Type, isRelation bool, target Entity, capacity uint32) column {	855✔
20	// TODO: should be use a slice instead of an array here?	855✔
21	data := reflect.New(reflect.ArrayOf(int(capacity), tp)).Elem()	855✔
22	pointer := data.Addr().UnsafePointer()	855✔
23		855✔
24	return column{	855✔
25	data: data,	855✔
26	pointer: pointer,	855✔
27	itemSize: sizeOf(tp),	855✔
28	isRelation: isRelation,	855✔
29	target: target,	855✔
30	len: 0,	855✔
31	}	855✔
32	}	855✔
33
34	// Len returns the number of components in the column.
35	func (c *column) Len() int {	1,002,431✔
36	return int(c.len)	1,002,431✔
37	}	1,002,431✔
38
39	// Cap returns the current capacity of the column.
40	func (c *column) Cap() int {	1,000,184✔
41	return c.data.Cap()	1,000,184✔
42	}	1,000,184✔
43
44	// Get returns a pointer to the component at the given index.
45	func (c *column) Get(index uintptr) unsafe.Pointer {	5,007,938✔
46	return unsafe.Add(c.pointer, index*c.itemSize)	5,007,938✔
47	}	5,007,938✔
48
49	// Add adds a component to the column.
50	func (c *column) Add(comp unsafe.Pointer) (unsafe.Pointer, uint32) {	498,312✔
51	c.Extend(1)	498,312✔
52	c.len++	498,312✔
53	return c.Set(c.len-1, comp), c.len - 1	498,312✔
54	}	498,312✔
55
56	// Alloc allocates memory for the given number of components.
57	func (c *column) Alloc(n uint32) {	501,866✔
58	c.Extend(n)	501,866✔
59	c.len += n	501,866✔
60	}	501,866✔
61
62	func (c column) AddAll(other column) {	3✔
63	oldLen := c.len	3✔
64	c.Alloc(other.len)	3✔
65	src := other.Get(0)	3✔
66	dst := c.Get(uintptr(oldLen))	3✔
67	copyPtr(src, dst, c.itemSize*uintptr(other.len))	3✔
68	}	3✔
69
70	// Set overwrites the component at the given index.
71	func (c *column) Set(index uint32, comp unsafe.Pointer) unsafe.Pointer {	1,001,332✔
72	dst := c.Get(uintptr(index))	1,001,332✔
73	if c.itemSize == 0 {	1,001,785✔
74	return dst	453✔
75	}	453✔
76
77	copyPtr(comp, dst, uintptr(c.itemSize))	1,000,879✔
78	return dst	1,000,879✔
79	}
80
81	// Remove swap-removes the component at the given index.
82	// Returns whether a swap was necessary.
83	func (c *column) Remove(index uint32, zero unsafe.Pointer) bool {	995,831✔
84	lastIndex := uintptr(c.len - 1)	995,831✔
85	swapped := index != uint32(lastIndex)	995,831✔
86		995,831✔
87	if swapped && c.itemSize != 0 {	1,987,183✔
88	src := unsafe.Add(c.pointer, lastIndex*c.itemSize)	991,352✔
89	dst := unsafe.Add(c.pointer, uintptr(index)*c.itemSize)	991,352✔
90	copyPtr(src, dst, uintptr(c.itemSize))	991,352✔
91	}	991,352✔
92	c.len--	995,831✔
93	if zero != nil {	1,494,480✔
94	c.Zero(lastIndex, zero)	498,649✔
95	}	498,649✔
96	return swapped	995,831✔
97	}
98
99	// Extend the column to be able to store the given number of additional components.
100	// Has no effect of the column's capacity is already sufficient.
101	// If the capacity needs to be increased, it will be doubled until it is sufficient.
102	func (c *column) Extend(by uint32) {	1,000,178✔
103	required := c.Len() + int(by)	1,000,178✔
104	cap := c.Cap()	1,000,178✔
105	if cap >= required {	1,999,504✔
106	return	999,326✔
107	}	999,326✔
108	for cap < required {	1,792✔
109	cap *= 2	940✔
110	}	940✔
111	old := c.data	852✔
112	c.data = reflect.New(reflect.ArrayOf(cap, old.Type().Elem())).Elem()	852✔
113	c.pointer = c.data.Addr().UnsafePointer()	852✔
114	reflect.Copy(c.data, old)	852✔
115	}
116
117	// Zero resets the memory at the given index.
118	func (c *column) Zero(index uintptr, zero unsafe.Pointer) {	498,649✔
119	if c.itemSize == 0 {	498,774✔
120	return	125✔
121	}	125✔
122	dst := unsafe.Add(c.pointer, index*c.itemSize)	498,524✔
123	copyPtr(zero, dst, uintptr(c.itemSize))	498,524✔
124	}
125
126	// Zero resets a block of storage in one buffer.
127	func (c *column) ZeroRange(start, len uint32, zero unsafe.Pointer) {	2✔
128	size := uint32(c.itemSize)	2✔
129	if size == 0 {	3✔
130	return	1✔
131	}	1✔
132	var i uint32	1✔
133	for i = 0; i < len; i++ {	33✔
134	dst := unsafe.Add(c.pointer, (i+start)*size)	32✔
135	copyPtr(zero, dst, c.itemSize)	32✔
136	}	32✔
137	}
138
139	func (c *column) Reset(zero unsafe.Pointer) {	3✔
140	len := c.len	3✔
141	if c.len == 0 {	3✔
142	return	×
143	}	×
144	c.len = 0	3✔
145	if zero == nil {	4✔
146	return	1✔
147	}	1✔
148	if len <= 64 { // A coarse estimate where manually zeroing is faster	4✔
149	c.ZeroRange(0, len, zero)	2✔
150	} else {	2✔
151	c.data.SetZero()	×
152	}	×
153	}

mlange-42 / ark / 13593874277

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous