Commit Graph

31232 Commits

Author SHA1 Message Date
Michael Catanzaro
6e896f5673 Merge branch 'th/gdataset-index' into 'main'
[th/gdataset-index] add a lookup index (GHashTable) to `GData`

See merge request GNOME/glib!3885
2025-01-16 17:46:53 +00:00
Philip Withnall
6c660596ea Merge branch 'document-deprecated-flags-none' into 'main'
gioenums: Add deprecation for FLAGS_NONE

See merge request GNOME/glib!4454
2025-01-13 19:42:10 +00:00
Maximiliano
9d3c384565 gioenums: Add deprecation for FLAGS_NONE
g-ir won't pick it if it is not in its own doc block.

Requires
https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/512,
otherwise the deprecated tag won't be set in the introspection data.
2025-01-13 19:42:09 +00:00
Philip Withnall
ce7e867e57 Merge branch 'nielsdg/main-loop-docs' into 'main'
docs: Use gi-docgen syntax in main-loop.md

See merge request GNOME/glib!4455
2025-01-13 18:34:10 +00:00
Philip Withnall
b65e950b3e
docs: More gi-docgen linking in main-loop.md
Port the rest of the document to gi-docgen syntax, so we don’t have to
track partially-ported files.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Helps: #3250
2025-01-13 17:47:12 +00:00
Niels De Graef
bd148fd04d docs: Use gi-docgen syntax in main-loop.md
The "Main Loop" documentation wasn't actually linking to `GMainContext`
properly, so let's fix this.
2025-01-12 15:33:19 +01:00
Michael Catanzaro
7129521966 Merge branch 'dev' into 'main'
corrected Memory management of signal handlers anchor

Closes #3563

See merge request GNOME/glib!4453
2025-01-10 15:29:36 +00:00
arujjval
b67d6ec9ff
corrected Memory management of signal handlers anchor 2025-01-10 12:51:45 +05:30
Thomas Haller
3437414dd4 gdataset: use lookup index in g_datalist_id_remove_multiple()
In order to reuse datalist_find(), we turn the loops around. First loop
over the keys, and then (internally in datalist_find()) loop over the
entries.
2025-01-08 00:36:52 +01:00
Thomas Haller
af4a43b064 gdataset: handle up to G_MAXUINT32 entries
GData is a thread safe container. For that reason, it probably is anyway
not suitable to add 4 billion entries. That is even with the new index,
where we now scale with O(1).

Still, the code should not just break down at half of what we
theoretically could add.

Handle overflow and huge sizes correctly.
2025-01-08 00:36:52 +01:00
Thomas Haller
9abc4d9be6 gdataset: use hash lookup in g_datalist_get_data()
g_datalist_get_data() tries to avoid g_quark_try_string() and instead
do the lock-less g_quark_to_string(). For small number of entries that
may perform better. At least, this was an optimization from the past.

However, if we have a GHashTable index, and presumably a larger number
of entries, we should use the index instead. Unfortunately, that requires
us again to use g_quark_try_string() and take a global lock.
2025-01-08 00:36:52 +01:00
Thomas Haller
0746df4906 gdataset: add GHashTable lookup index to GData
GData tracks the entries in a linear array, and performs a linear
search. That is very good, as long as the number of entries is small.
However, when it grows, performance gets worse. It's not clear what the
exact threshold is, or what the recommended maximum is.

Also, GData is used to attach arbitrary user data to GObject. Which is a
great feature, that a user might want to use. In that case, they may be
less concerned about performance to get the benefits of the feature, and
thus add more data than is best (though, it's unclear how much is too
much).

Also, GObject adds entries in its qdata. Hence, also for basic GObject
operations, it's important that this performs well. Note that access to
GData happens while holding a lock, we want to minimize the time while
holding that lock.

This patch ensures that access to GData is O(1) (and reasonably fast).
It thus allows to use GData in ways that wasn't advised previously.

There are alternatives, like using a binary search tree or always use a GHashTable.
Instead, we keep the linear buffer. Only when the buffer grows to
ALLOC_THRESHOLD_INDEX entries, we will start generating and maintaining
a GHashTable index. So the common case where objects have few entries
does not change. The memory overhead is only there, when the list grows.

ALLOC_THRESHOLD_INDEX is set to 64 entries. We will allocate such a
large buffer when adding the 33rd entry. During shrink, we will drop the
buffer again when shrinking down to 16 entries.

The reason for not always using the GHashTable is to save the memory in
common cases where there are few entries.

We use g_hash_table_add() to exploit the GHashTable optimization. We
also let it point to the GDataElt from the linear array. The benefit is
that we don't require individual allocations. The downside is that
during reallocation we need to regenerate the entire index.

In my tests this actually performs well. For example, following are
timings for calling g_dataset_id_get_data() in a loop. This is the
lookup time for an entry that doesn't exist. Obviously, the linear
search would scale always best when we would only lookup the first entry
in the list.

   num-entries     time-before   time-after
             1           0.144        0.145
             2           0.146        0.146
             5           0.149        0.150
            10           0.155        0.157
            20           0.172        0.170
            32           0.248        0.254
            33           0.249        0.184  <== index in use
            40           0.284        0.183
            50           0.317        0.189
            75           0.370        0.184
           100           0.442        0.183
           300           1.044        0.186
          1000           3.170        0.184
         10000          31.597        0.189
2025-01-08 00:36:52 +01:00
Thomas Haller
cc53252c5b gdataset: add datalist_realloc() helper
This will be more useful next.

Also, try to detect whether realloc() actually moved the pointer. If it
doesn't, we can optimize a bit (not use g_datalist_unlock_and_set()).
Next, we will do more useful optimization in this case.

Note that we cannot just compare dangling pointers. That's would be
undefined behavior. In practice, we probably often compare dangling
pointers, and this tends to work just fine. Still avoid this and compare
only the guintptr values.
2025-01-08 00:36:52 +01:00
Thomas Haller
9a8e2ab263 gdataset: extract helper function for struct size 2025-01-08 00:36:52 +01:00
Thomas Haller
2900575283 gdataset: extract datalist_destroy() helper function for releasing GData
Avoid duplicated code.

Also, the "if (data->data[i].data && " check is unnecessary. The data
pointer is never NULL, because g_datalist_id_set_data() will treat that
as indication to remove the entry.
2025-01-08 00:36:52 +01:00
Thomas Haller
6063cdb79f gdataset/tests: improve "/datalist/id-remove-multiple/resize" test 2025-01-08 00:36:51 +01:00
Michael Catanzaro
127d38b0d3 Merge branch 'scan-build-warnings' into 'main'
Add several assertions to help static analysis and fix some GIR annotations

See merge request GNOME/glib!4449
2025-01-03 21:26:29 +00:00
Philip Withnall
92528d3802 Merge branch 'le-be-swap-gcc' into 'main'
Fix GCC version detection for GUINT*_SWAP_LE_BE

See merge request GNOME/glib!4450
2025-01-03 18:54:26 +00:00
Sam James
be57844b38
Fix GCC version detection for GUINT*_SWAP_LE_BE
The #if condition as-written fails for any major >= 5 if minor < 3, e.g.
GCC 14.2 and so on.

Use the idiom described in the GCC docs [0] to avoid this.

[0] https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html

Fixes: 57878d6042
2025-01-01 17:47:30 +00:00
Philip Withnall
e70144bf5b
gtestutils: Add missing colon in GIR annotation
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 13:06:13 +00:00
Philip Withnall
5147d503b4
goption: Fix typo in GIR annotation
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 13:05:38 +00:00
Philip Withnall
6f6743de61
gfilteroutputstream: Fix duplicated property name in doc comment
Looks like a copy/paste error from the doc comment immediately below.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 13:05:02 +00:00
Philip Withnall
61ce6d5511
tests: Initialise an array’s elements to NULL
This is not strictly necessary, but helps scan-build understand that the
`g_thread_join()` calls are not going to use uninitialised `GThread`
pointers. It can’t reason that the number of loop iterations on the
`g_thread_create()` and `g_thread_join()` loops are identical.

Fixes:
```
../../../glib/tests/mutex.c:271:5: warning: 1st function call argument is an uninitialized value [core.CallAndMessage]
  271 |     g_thread_join (threads[i]);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~
```

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 12:53:12 +00:00
Philip Withnall
472aef8278
tests: Add various non-null checks to extended error domain tests
This silences various ‘potential null pointer dereference’ warnings from
scan-build.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 12:52:40 +00:00
Philip Withnall
1ab1cd6ba4
gfileutils: Add an assertion to help static analysis
This assertion basically mirrors the existing `buffer_size >= 2`
assertion (one implies the other), but scan-build doesn’t seem to be
able to work that out — so give it some help.

Fixes:
```
../../../glib/gfileutils.c: In function ‘g_get_current_dir’:
../../../glib/gfileutils.c:2995:17: warning: potential null pointer dereference [-Wnull-dereference]
 2995 |       buffer[1] = 0;
      |       ~~~~~~~~~~^~~
../../../glib/gfileutils.c:2994:17: warning: potential null pointer dereference [-Wnull-dereference]
 2994 |       buffer[0] = G_DIR_SEPARATOR;
```

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-31 12:45:42 +00:00
Philip Withnall
68388cf7f7 Merge branch 'mcatanzaro/#3558' into 'main'
Remove incorrect (inout) annotations from GWeakRef

Closes #3558

See merge request GNOME/glib!4426
2024-12-29 18:49:08 +00:00
Michael Catanzaro
55fbcb21d9 Merge branch 'autorelease-urlspec' into 'main'
Use autorelease pool to manage cocoa memory.

Closes #3568

See merge request GNOME/glib!4448
2024-12-22 00:49:56 +00:00
John Ralls
d3705ecdcf g_osx_appinfo_launch: Use autorelease pool to manage cocoa memory.
Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/3568
2024-12-21 13:12:41 -08:00
Philip Withnall
fbe324086e Merge branch 'unix-mounts-docs' into 'main'
gunixmounts: Clarify GUnixMountMonitor documentation and convert to gi-docgen linking syntax

Closes #3569

See merge request GNOME/glib!4447
2024-12-20 18:40:04 +00:00
Philip Withnall
2ebd1c8f15
docs: Hide Unix and Win32 symbols from main GLib and GIO docs
These symbols are documented in the {glib,gio}-{unix,win32}
documentation builds, and shouldn’t be duplicated in the main
documentation. It’s a historical (and unavoidable) accident that those
symbols are in the main GIR files.

If we don’t hide the symbols from the main docs build, we now run into
the problem of the `GioUnix` namespace not being known to gi-docgen
while building the `Gio` docs. This is because of the previous two
commits, which ported more of the `gunixmounts` documentation to
gi-docgen syntax. I don’t know of another way to fix this, other than to
hide the `GioUnix` symbols from the `Gio` docs build.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3250
2024-12-20 15:13:16 +00:00
Philip Withnall
46160f9aad
gunixmounts: Convert docs to gi-docgen linking syntax
Improve formatting while I’m there, and try and ensure all the docs in
these two files matches the
[guidelines](https://developer.gnome.org/documentation/guidelines/devel-docs.html#writing-api-references).

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3250
2024-12-20 15:11:41 +00:00
Michael Catanzaro
b599885abe Merge branch 'another-broken-spec-link' into 'main'
gio: Fix a link to a specifications document

See merge request GNOME/glib!4446
2024-12-20 13:03:16 +00:00
Philip Withnall
12f969eb79
gunixmounts: Consistently capitalise Unix in the documentation
Let’s not go with SHOUTY UNIX or quiet unix, let’s just call it what
Wikipedia calls it (https://en.wikipedia.org/wiki/Unix).

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-20 12:42:58 +00:00
Philip Withnall
05afb30510
gunixmounts: Document caveats with *_changed_since() APIs
They need a `GUnixMountMonitor` to give valid timestamps, and if you
have one of those then you might as well listen to its signals anyway.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: #3569
2024-12-20 12:34:12 +00:00
Philip Withnall
2f010f5618
gunixmounts: Fix typo in deprecation documentation
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-20 12:25:22 +00:00
Philip Withnall
5029f3aae9
gio: Fix a link to a specifications document
If only someone would go ahead and invent a whole section of the list of
HTTP status codes which could be used to inform a client of where a
document has been moved to.

For the sake of argument, let’s say it could be status codes 300–399,
since they appear to be completely unused at the moment.

😩

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
2024-12-19 23:09:17 +00:00
Philip Withnall
bfeca8c13a Merge branch '3562-bytes-null' into 'main'
gbytes: Squash data to `NULL` if length is zero

Closes #3562

See merge request GNOME/glib!4445
2024-12-18 17:40:46 +00:00
Philip Withnall
d0c9c080b8
gbytes: Squash data to NULL if length is zero
This used to happen consistently before !4290, but that MR changed it so
that `data` could be non-`NULL` if `size == 0` if the new inline code
path is taken.

While users of `GBytes` shouldn’t be dereferencing the data if the
bytes’ length is zero, it’s definitely safer to make sure the data is
`NULL` in that case.

This shouldn’t break the expectations of any third party code because
it’s restoring the behaviour from before !4290.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: #3562
2024-12-17 17:39:23 +00:00
Philip Withnall
629733ff87 Merge branch 'work-around-meson-bugs' into 'main'
Don't define test setups unless we're testing

See merge request GNOME/glib!4442
2024-12-17 13:59:06 +00:00
Matthias Clasen
547edc4c3c Don't mark test setups as default in subprojects
This is problematic since meson is defective when it comes to
default test setups. It only allows a single such across all
(sub)projects.

See https://github.com/mesonbuild/meson/issues/12700
2024-12-17 08:18:29 -05:00
Philip Withnall
988cfb5ff1 Merge branch 'build-introspection-yield' into 'main'
build: Make the introspection feature yield

See merge request GNOME/glib!4443
2024-12-16 15:11:08 +00:00
Philip Withnall
2e48a3ffc7 Merge branch 'wip/smcv/issue3564' into 'main'
girepository: Correct --c-include arguments for GIO Unix/Windows headers

Closes #3564

See merge request GNOME/glib!4439
2024-12-16 13:44:24 +00:00
Philip Withnall
4ee1e25655 Merge branch 'pointer-param-docs' into 'main'
Fix pointer-to-paramref syntax in docs

See merge request GNOME/glib!4444
2024-12-16 12:43:05 +00:00
FeRD (Frank Dana)
9f016e5de4 Fix pointer-to-paramref syntax in docs
The documentation for GLib and Gio contains a number of documentation
comment blocks where a parameter reference (e.g. `@err`) is also
discussed in its dereferenced pointer form, which is generally
annotated as `*@err`. This inevitably confuses the MarkDown parser,
which sees the `*` as the beginning of an italicized text span.

To avoid this, replace all `*@foo` with <code>`*foo`</code>, which
loses the `@`-sigil linking it to the `@foo` parameter, but formats
correctly in the rendered documentation. (`@foo` is automatically
formatted like <code>`foo`</code>, so the resulting appearance in
the docs is as intended.)
2024-12-15 18:51:26 -05:00
Simon McVittie
ce991fc930 Merge branch 'drop-redundant-paragraph' into 'main'
gstrfuncs: Drop a redundant paragraph

See merge request GNOME/glib!4441
2024-12-14 18:33:16 +00:00
Matthias Clasen
826bbf5b57 build: Make the introspection feature yield
This is expected by other projects who use glib as a subproject,
and there is little point in making the option a feature unless
you inherit it.
2024-12-14 12:30:49 -05:00
Emmanuele Bassi
8cf01c8f81 Merge branch 'wip/smcv/reproducible-enumtypes' into 'main'
gio, gobject: Improve reproducibility of enumtypes headers

See merge request GNOME/glib!4440
2024-12-14 15:26:54 +00:00
Adrien Plazas
c777b55d1a gstrfuncs: Drop a redundant paragraph
Signed-off-by: Adrien Plazas <aplazas@gnome.org>
2024-12-14 11:44:39 +01:00
Simon McVittie
a4d084e975 gio, gobject: Improve reproducibility of enumtypes headers
`@filename@` expands to the (absolute or relative) path from the
build directory to the source directory, which can be rather verbose.
In practice Meson usually (always?) generates a relative path, but
even so, the resulting installed header is not necessarily reproducible
if using different build directories outside the source directory.

We don't really need a full path here anyway: the basename is enough
of a hint to point a reader towards the file where the underlying
enum was defined.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 23:40:32 +00:00
Simon McVittie
feca93e51e girepository: Correct --c-include arguments for GIO Unix/Windows headers
The deprecated construct '@0@'.format(h) (where h is a file object)
expanded to the filename relative to the project root, which in this
particular case happens to be what we wanted:
`--c-include=gio/gunixmounts.h` resulted in a recommendation to
`#include <gio/gunixmounts.h>` and so on. Replacing it with
h.full_path() resulted in GIR XML and documentation that recommended
constructs like `#include </home/me/src/glib/gio/gunixmounts.h>`,
which is not what was intended (and caused new differences between
different architectures' Gio-2.0.gir on multiarch systems, which is
how I discovered this).

Hard-coding `gio/` and appending the basename of the header seems like
the simplest non-deprecated spelling that will do what we wanted.

Fixes: 51e3e7d9 "build: Bump Meson dependency to 1.4.0"
Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3564
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 23:34:10 +00:00