Commit Graph

30872 Commits

Author SHA1 Message Date
Philip Withnall
d7e368f206
tests: Move fake-document-portal subprocess inside dbus-appinfo test
For the reasons given in
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4176#note_2233317,
it’s best to not rely on subprocesses when writing tests. Spawning a
subprocess can go wrong, getting feedback and assertion data from a
subprocess is a pain, and making sure the subprocess is killed properly
at the end of the test is hard to get right.

For tests where we are trying to mock a D-Bus service, it’s much more
reliable to run that service in-process (either in the main thread or in
a separate thread).

So, do that for the `fake-document-portal` former subprocess in the
`dbus-appinfo` test: move it to a worker thread.

This speeds the test up, simplifies the build slightly, and should make
the test run more reliable.

In particular, it provides a pattern for future `fake-*-portal` tests to
be built off. This is particularly useful for more complex portals,
where data needs to be relayed back from the mock portal service to the
unit test to check that the code under test has behaved properly. That’s
a pain to do from a subprocess.

Delete the `org.freedesktop.portal.Documents.service` file because we no
longer need to rely on D-Bus service activation within the test, as
we’re setting up the mock service thread explicitly now.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-10-01 15:22:40 +01:00
Philip Withnall
d7bb4664e7
tests: Add a way to get the mock session bus address in tests
This is better than using `g_getenv ("DBUS_SESSION_BUS_ADDRESS")` as it
will fail more explicitly if the mock bus somehow isn’t running.

This will be used in an upcoming commit.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-09-27 17:08:21 +01:00
Philip Withnall
019de2cbbc Merge branch 'wip/chergert/gvariant-inline-suffix-data' into 'main'
glib/gvariant: Inline small gvariant data using C99 flexible arrays

See merge request GNOME/glib!4301
2024-09-27 12:35:05 +00:00
Philip Withnall
0a9573b53b Merge branch 'wip/lantw/tests-FreeBSD-doesn't-use-glibc' into 'main'
tests: FreeBSD doesn't use glibc

See merge request GNOME/glib!4310
2024-09-27 11:34:36 +00:00
Ting-Wei Lan
095fd5a06b tests: FreeBSD doesn't use glibc
FreeBSD has its own libc implementation. It is maintained as a part of
the operating system, not a copy of glibc.
2024-09-27 11:41:33 +08:00
Christian Hergert
0b083e3d8c glib/gvariant: Avoid many GBytes allocation
Previously, all GVariants would allocate a GBytes for the buffered
contents. This presents a challenge for small GVariant type created
during the building process of GVariantBuilder as that results in an
allocation for the GVariant, GBytes, and the byte buffer.

Recent changes for GBytes may reduce those 3 allocations to 2, but even
that is quite substantial overhead for a 32-bit integer.

This changeset switches GVariant to use g_new/g_free allocators instead
of g_slice_new/free. When benchmarked alone, this presented no
measurable difference in overhead with the standard glibc allocator.

With that change in place, allocations may then become variable in size
to contain small allocations at the end of the GVariant reducing things
to a single allocation (plus the GVariantTypeInfo reference).

The size of GVariant is already 1 cacheline @ 64-bytes on x86_64. This
uses that to guarantee our alignment of data maintains the 8-bytes
guarantee of GVariant, and also extends it to match malloc().

On 32-bit systems, we are similarly aligned but reduce the amount we
will inline to 32 bytes so we have a total of 1 cacheline.

This is all asserted at compile-time to enforce the guarantee.

In the end, this changeset reduces the wallclock time of building many
GVariant in a loop using GVariantBuilder by 10% beyond the 10% already
gained through GBytes doing the same thing.
2024-09-26 14:28:41 -07:00
Michael Catanzaro
0012d1921d Merge branch 'main' into 'main'
fix https://gitlab.gnome.org/GNOME/glib/-/issues/3444

Closes #3444

See merge request GNOME/glib!4309
2024-09-26 21:01:20 +00:00
stefan11111
89480c2e0a fix https://gitlab.gnome.org/GNOME/glib/-/issues/3444 2024-09-26 22:47:30 +03:00
Philip Withnall
c2a5bd2c65 Merge branch 'wip/chergert/no-copy-gvarianttype-stack-builder' into 'main'
glib/gvariant: avoid GVariantType copy for stack builders

See merge request GNOME/glib!4286
2024-09-26 11:57:26 +00:00
Christian Hergert
0f95b18a7b gio: use g_variant_builder_init_static()
All uses of g_variant_builder_init() in gio are safe to translate to the
new g_variant_builder_init_static() alternative as the type will outlive
the call to g_variant_builder_end() (or is already static in nature).
2024-09-26 12:48:16 +01:00
Christian Hergert
bfac590364 gio/gdbus-codegen: use g_variant_builder_init_static()
Make the generated GDBus-based code use GVariantBuilder with a static
GVariantType to avoid copying the GVariantType on each use.

This is gated behind a GLib 2.83.0 check.
2024-09-26 12:48:16 +01:00
Philip Withnall
80e8bc7c0b Merge branch 'wip/chergert/reduce-copies-for-gvarianttype-cache' into 'main'
gvarianttypeinfo: reduce caching overhead

See merge request GNOME/glib!4293
2024-09-26 11:11:52 +00:00
Philip Withnall
2258c08769 Merge branch 'main' into 'main'
gpoll windows: use a threadpool when polling large number of fds

See merge request GNOME/glib!4300
2024-09-26 10:27:20 +00:00
Yash Trivedi
3baf1f1a73 gpoll windows: use a threadpool when polling large number of fds 2024-09-26 10:27:19 +00:00
Christian Hergert
c50e44a6e0 glib/gvariant: add g_variant_builder_init_static()
This adds another form of stack building which allows avoiding the rather
expensive GVariantType malloc/memcpy/free. In a tight loop this reduced
wallclock time by about 4-5% for cases where you do not need to further
open using g_variant_builder_open() which still require a copy at this
time.

New API is provided instead of modifying g_variant_type_init() because
previously it was possible (though misguided) to use g_variant_type_init()
which a dynamically allocated GVariantType which could be freed before
g_variant_builder_end() or g_variant_builder_clear() was called.

# Conflicts:
#	glib/gvariant.c
2024-09-25 11:13:58 -07:00
Christian Hergert
2deb5dcfc0 glib/gvariant: add test for g_variant_type_hash() 2024-09-25 10:05:36 -07:00
Christian Hergert
1850b5c1ab gvarianttypeinfo: avoid string copy for cache lookup
When trying to locate a GVariantTypeInfo from the cache we were copying
the string so that we can use g_str_hash, as that requires a \0 terminated
string.

However, we have hash and equal functions which can be used without the
extra copy. Additionally, these were moved to headers in previous commits
so they can be used without having to re-check GVariantType we already
know to be valid.
2024-09-25 10:05:33 -07:00
Philip Withnall
133ade7244 Merge branch 'ebassi/gi-docgen-wrap-update' into 'main'
Update the wrap file for gi-docgen

See merge request GNOME/glib!3816
2024-09-25 16:45:45 +00:00
Philip Withnall
efab4c1c71
build: Bump the gi-docgen dependency to 2024.1
This gives us an updated enumeration template and link validation,
amongst other things.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-09-25 17:27:46 +01:00
Emmanuele Bassi
e6d0229b22 subprojects: Update the wrap file for gi-docgen
Use the [provide] section to override the binary name, and track the
main development branch, like GTK does, so we get warnings and a
consistent output.
2024-09-25 17:24:56 +01:00
Philip Withnall
428942d626 Merge branch 'wraps' into 'main'
subprojects: Update pcre2 to 10.44

See merge request GNOME/glib!4268
2024-09-25 16:22:53 +00:00
Philip Withnall
8b8b8a5a5e
ci: Bump CI image versions to cache new version of PCRE
As per the previous commit.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-09-25 17:06:10 +01:00
Benjamin Gilbert
47f11d20d9 subprojects: Update pcre2 to 10.44
Bug fixes.
2024-09-25 17:06:04 +01:00
Philip Withnall
0ad601ef38 Merge branch 'c_std' into 'main'
build: switch back to c_std=gnu99 pending ObjC fix

See merge request GNOME/glib!4305
2024-09-25 15:22:03 +00:00
Philip Withnall
fd9c00179f Merge branch 'wip/chergert/gvariant-use-proper-macros-conditions' into 'main'
Fix incorrect use of assert/debug/check macros

See merge request GNOME/glib!4292
2024-09-25 15:06:10 +00:00
Benjamin Gilbert
23009aadc6 build: switch back to c_std=gnu99 pending ObjC fix
It's better to warn by default on MSVC (which we were already doing before
we bumped to 1.4.0) than to fail by default on macOS.

Fixes: 51e3e7d9ae ("build: Bump Meson dependency to 1.4.0")
2024-09-25 07:45:06 -07:00
Philip Withnall
f2ca182ab4 Merge branch 'wip/chergert/fix-gvariant-spec' into 'main'
docs/gvariant: fix a(si) example in specification

Closes #3478

See merge request GNOME/glib!4289
2024-09-25 14:39:05 +00:00
Philip Withnall
267342420f Merge branch 'wip/chergert/fix-ganalyzer-use' into 'main'
glib/gvariant: Fix check for G_ANALYZER_ANALYZING

Closes #3480

See merge request GNOME/glib!4291
2024-09-25 13:43:02 +00:00
Philip Withnall
04e45e3cef Merge branch 'wip/chergert/gvariant-transfer-gbyte-ownership' into 'main'
glib/gvariant: Avoid extraneous GBytes ref counting

See merge request GNOME/glib!4299
2024-09-25 13:42:57 +00:00
Philip Withnall
2691c5e24e
gdbusdaemon: Fix check for G_ANALYZER_ANALYZING
As with the previous commit, this is _always_ defined in `gmacros.h`
and therefore the `#ifndef` will always be 0 even if disabled.
Just use `#if` instead.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-09-25 14:30:48 +01:00
Philip Withnall
5ac765689c Merge branch 'wip/chergert/g_variant_ref_sink-perf' into 'main'
glib/gvariant: skip bitlock for g_variant_ref_sink()

See merge request GNOME/glib!4302
2024-09-25 13:21:56 +00:00
Philip Withnall
765eea0a78 Merge branch 'wip/chergert/gvarianttype-proper-const' into 'main'
gvarianttype: mark const functions as such

See merge request GNOME/glib!4294
2024-09-25 13:11:11 +00:00
Philip Withnall
e071e1bfc0 Merge branch 'wip/chergert/avoid-malloc-in-format-string-validation' into 'main'
gvariant: Avoid malloc/free in valid_format_string()

See merge request GNOME/glib!4295
2024-09-25 13:10:34 +00:00
Philip Withnall
5d40bc448e Merge branch 'wip/chergert/g_variant_type_is_subtype_of-fastpath' into 'main'
glib/gvarianttype: g_variant_type_is_subtype_of() fastpath

See merge request GNOME/glib!4297
2024-09-25 13:08:52 +00:00
Philip Withnall
4596bd819d Merge branch 'wip/chergert/gvariantbuilder-avoid-g_renew-for-known-children-length' into 'main'
glib/gvariant: avoid g_renew() for definite tuples

See merge request GNOME/glib!4298
2024-09-25 13:03:22 +00:00
Christian Hergert
9a380ee918 glib/gvariant: Avoid extraneous GBytes ref counting
Right now we create a bunch of GBytes which then get their reference count
incremented and immediately decremented. This causes quite a bit of
disruption for cacheline re-use.

Instead, this change creates an internal helper to transfer ownership of
GBytes to the new GVariant directly.

Surprisingly, this reduced wallclock time by about 6% for a contrived
benchmark of building "as" variant with GVariantBuilder.
2024-09-25 13:09:17 +01:00
Philip Withnall
842c828535 Merge branch 'wip/chergert/use-utf8-validate-for-strlen' into 'main'
glib/gvariant: use g_utf8_validate() for strlen

See merge request GNOME/glib!4296
2024-09-25 12:00:26 +00:00
Philip Withnall
4a72791181
tests: Add tests for UTF-8 checks for g_variant_new_string()
Brings the test coverage from the previous commit back up to 100% of
lines of those functions.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-09-25 12:24:22 +01:00
Philip Withnall
67d5c59c5a Merge branch 'wip/chergert/gbytes-avoid-alloc' into 'main'
glib/gbytes: save small byte buffers inline

See merge request GNOME/glib!4290
2024-09-25 10:49:20 +00:00
Christian Hergert
1e3b010af8 glib/gbytes: save small byte buffers inline
When dealing with small allocations it can save considerable cycles to
do a single allocation for both the GBytes and the data by tacking it
onto the end of the GBytes.

Care is taken to preserve the glibc expectation of 2*sizeof(void*)
alignment of allocations at the expense of some padding bytes.

The degenerate case here is when you want to steal the bytes afterwards
but that amounts to the same overhead as the status-quo.

Where this can help considerably is in GVariant building such as
g_variant_new_int32() which allocates for the GVariant, the GBytes, and
the int32 within the GBytes.

In a simple benchmark of using GVariantBuilder to create "(ii)" variants
this saved about 10% in wallclock time.
2024-09-25 10:49:19 +00:00
Philip Withnall
0d1719868d Merge branch 'girepository-gcc48' into 'main'
girepository: Make _blob_is_registered_type static inline

See merge request GNOME/glib!4288
2024-09-25 10:42:53 +00:00
Olivier Blin
190f9249cd girepository: Make _blob_is_registered_type static inline
This follows the usage in the glib codebase and recommendations at
main/docs/toolchain-requirements.md

It also fixes a build warning with ancient gcc 4.8:
../girepository/gitypelib-internal.h:202:1: warning:
no previous prototype for ‘_blob_is_registered_type’ [-Wmissing-prototypes]
2024-09-25 10:45:05 +02:00
Christian Hergert
3566aeb079 glib/gvariant: skip bitlock for g_variant_ref_sink()
In almost all cases, the variant is sunk shortly after creation and
certainly before other threads get a view of it.

This skips the bitlock for STATE_FLOATING, which is also done in
g_variant_take_ref(). We can do this because STATE_FLOATING may only
be set up-front, never after being cleared.

That allows us to do a relaxed read of the value once (which if it is
zero means no additional atomics beyond our ref count increment) as well
as a single atomic if we do in fact steal the floating reference.

Without any other GVariant performance changes, this is in the 2% range
of benchmarking a tight loop using GVariantBuilder. However, after the
rest of them are applied, the percentage is greater due to reduced
runtime overhead and lands in the 4.5% range.
2024-09-24 18:24:55 -07:00
Christian Hergert
bd0f462729 glib/gvariant: avoid g_renew() for definite tuples
If you have a definite-tuple type such as (iiii) then the number of
children that are allocated will match the offset when a GVariantBuilder
has completed.

That means we can avoid an expensive call into the allocator which is
normally done to shrink memory use by releasing it back to the allocator.

This saves about 5% of wallclock time when building such variants in a
tight loop.
2024-09-24 11:23:54 -07:00
Christian Hergert
7d4ea04ee2 glib/gvarianttype: g_variant_type_is_subtype_of() fastpath
This adds a fastpath for the extremely common case of checking if a
GVariant type is a subtype of itself _and_ a definite basic type. For
example, checking 'i' against 'i' or 's' against 's'.

In a loop using GVariantBuilder this can cut the cost of this function
alone in half on profiles from 3.3% of samples to 1.7% of samples.
2024-09-24 11:13:56 -07:00
Christian Hergert
db77480d97 glib/gvariant: use g_utf8_validate() for strlen
We can get the length of the string if we provide an out argument to
g_utf8_validate(). This avoids an extra strlen() when creating GVariant
for UTF-8 strings.

This is good for nearly 7% reduction of CPU samples when building
heavily string-based GVariant using GVariantBuilder as a benchmark.
2024-09-24 11:06:15 -07:00
Christian Hergert
7e362048a3 gvariant: Avoid malloc/free in valid_format_string()
Any extremely common use-case of valid_format_string() is validation
when using GVariantBuilder. The optimal-case there is that there is
no programming error and thus the fast path should match.

This creates a fast path for that case without substantial change to the
GVariant type-checking case by checking for a non-NULL GVariant. It then
proceeds to hoist the actual scan directly without type allocation.

Locally this single change reduces wallclock time in a single-threaded
benchmark using GVariantBuilder by 17%.
2024-09-24 11:02:22 -07:00
Christian Hergert
49bfa7b9cf gvarianttype: mark const functions as such
These functions only rely on their input parameter and no globals, thus
are candidates for sub-expression elimination.
2024-09-24 10:59:20 -07:00
Christian Hergert
72f217e25a gvarianttype: avoid walking type string twice to hash
We already need to walk the string to determine the length of it, so just
hash the string at the same time.
2024-09-24 10:54:32 -07:00
Christian Hergert
9879b7152a gvarianttype: reduce g_variant_type_equal() overhead
Previously, g_variant_type_equal() would walk the strings multiple times.
In debug builds, you initially have the type checks for validity. But
also you walk the string to determine its length only to memcmp it after.

Instead, this does the comparison while walking the string for length.
2024-09-24 10:54:26 -07:00