Pull updates from refactor/wutil-rs into Rust rewrite trunk #8

trurl · 2025-11-14T01:03:03-05:00

trurl commented

2025-11-14 01:03:03 -05:00

No description provided.

trurl added 40 commits 2025-11-14 01:03:04 -05:00

memory: replace most of memory.c with Rust mem d91275d959

Replace `wmalloc` et al with wrappers around the Rust allocation
library.

Rip out Boehm GC support. e3fb8ddbc8

This is done to simplify memory management across the boundary between C and
Rust. While rewriting WINGs, we may want to be able to malloc/free with the libc
allocator on both sides of that divide.

Port custom allocators (WINGs memory.c) to Rust. 46fcbb0ff1

This introduces the crate wutil-rs, which is intended to be the destination for
migrating the API of WINGs/WINGs/WUtil.h to Rust.

Remember to AC_SUBST the Rust compiler environment variables so they're visible in Makefiles. 5b0ad78f01

Use free() on memory returned by FcNameUnparse and hand back wfree-managed pointers from our functions. d50adaa1c8

This is necessary because we now allocate memory through a special allocator of
our own on the Rust side. Passing raw malloc'd pointers to wfree will break
things.

Replace most WUtil functions in findfile.c with Rust impls. 2b9b915768

This is not a bug-for-bug reimplementation, and it may need some shaking down to
ensure that everything still works. Once their dependents are ported, it would
be appropriate to dispose of them.

Reimplement WINGs array.c in Rust. 6ede7a5cb0

This is another utility that should not be used in any new (Rust) code. (We
should prefer Vec or something similar.) This should be removed once dependents
are ported to Rust.

Fix const qualifier on strings returned by wgethomedir. dd36130730

Forgot to add new array.rs impl. 3beadbb6cb

Eliminate the unused WINGs function WMCreatePLDataWithBytesNoCopy. dea8c36cd5

Eliminate the unused WINGs function WMGetSubdataWithRange. 9d07e2d3d8

Eliminate the WINGs function WMCreateDataWithBytesNoCopy. bbcf40ee47

This constructor was only needed in one particular place. We can duplidate the
data instead of borrowing it. This ensures that WMData always owns its data
segment, which simplifies porting to Rust significantly.

Drop WMData's destructor field. 52b0e6b182

WMData always owns its data and allocates it with wmalloc, so we can always free
it with wfree (and don't need to call anything else).

Correct oversight in how WMMapArray is supposed to work. 791149fe70

Port WINGs data.c (WMData) to Rust. f2e9123db6

This is not tested super well, but I hope we can be rid of it soon enough. (Once
we have WMPropList migrated, WMData and other WINGs data structures should be
easier to prune.)

Expose the GSUSER_SUBDIR preprocessor symbol to Rust. 5b593fb19a

This symbol's value must be known to port `wmkdirhier` and `wrmdirhier` from
`proplist.c` to Rust.

This change introduces a basic C library under wutil-rs that is linked into the
Rust code to expose preprocessor symbols and other Autotools configuration
decisions to Rust. See the rust rewrite notes at the top of
`wutil-rs/src/defines.rs` for further thoughts.

Reimplement the PropList data structure in Rust. f3961ba66f

While this large change has some unit tests, it has not been integration tested
thoroughly. Removing the global case insensitivity flag may be an issue in
particular.

A few of PropList API functions have been modified (mostly to get rid of
varargs). The definition of one such function has been left in C for cleanup
later.

Simplify path_from_cstr substantially (h/t cross). cf588d6e27

Allocate PropList description with memory::alloc_bytes. 12930739ec

All memory allocations passed back from FFI functions should be allocated with
`memory::alloc_bytes`, so that C code can call `memory::free_bytes` when it's
done with them.

Clean things up a little bit with refutable let. e6fd7e49f8

Chasing memory bugs in memory.rs: allocate the right layout. dfdaa67b4d

Clarify wmalloc contract - it's safe to read before writing. 6a98614d13

Chasing memory bugs in memory.rs: copy only the payload length in wrealloc. 14c316615e

Chasing memory bugs: be consistent about wmalloc/wfree. 2d2dd9febe

Provide alloc_string impl. bc163d13f6

Remove support for PropList data nodes. f69227ce19

This type of PropList entry appears to be completely unused, so let's be rid of
it. This can be reversed in the future if we do want more complete support for
property lists, but for now it's code that we don't need.

Drop WMStringHashCallbacks, which is unused. 252362545e

Eliminate the retainKey and releaseKey hashtable callbacks. 157a8e0d5a

These fields are only ever NULL, so there's no reason to keep them.

Replace WUtil hashtable with a Rust impl. 32c40643c2

This tweaks the hashtable API, and it is incomplete because the WUtil proplist
impl depends heavily on a feature of the old API that is being discontinued.

Moving the proplist code into Rust is our next objective.

Drop unused wAbort function from WPrefs.app. 7bded0055f

PropList array items should return NULL on OOB index access. 1a8d99b2c0

Don't pass wmalloc'd memory to XFree. bd61e58821

This is enough to get the wmaker into a minimally running state. We should
complete this change by reviewing #1.

Restore proplist.c, which was clobbered by mistake during a rebase. 4f4dcf551b

Lessons learned: don't rebase so freely, review commits properly.

Remove stale reference to libwings_rs (which should have been deleted in a rebase). fbd6400186

WMHashTable ownership: it doesn't own keys or values. 65726a1e6a

The WMHashTable rewrite was prematurely merged into refactor/wutil-rs, so we're
picking up the pieces now.

Satisfy the dangerous_implicit_autorefs lint. d66eb34f16

Update calls to malloc/free, etc., to use wmalloc/wfree/... 8c68f95291

This fixes a lot of memory bugs which arose as a result of doing something
different from the system malloc/free when allocators were rewritten in Rust.

These changes originate from a different approach to writing the allocator in
Rust:
https://git.sdf.org/vitrine/wmaker/pulls/1/files#diff-04a0fd2319b9969373b75377716e45c836d22869

There are other function calls (to XFree) that need to be fixed, but that can be
done in another commit. This one is already getting large.

Use wfree instead of XFree in a few more places. 564501953f

This fixes some crashes found in cursory smoke tests. You can now open and close
some windows without crashing immediately.

Remove VoidPointer impls that were commented out in previous commit. 026426e6c3

Tweak start-captive-wmaker.sh to behave a little more nicely. 46af2c27ee

* Select $DISPLAY dynamically because X11 likes :0 and Wayland likes :1 and who
knows what else might like some other value.
* Kill Xephyr after wmaker exits.
* 640x480 should be big enough for anyone. (And the window shouldn't get in the
way so much.)

trurl merged commit 46af2c27ee into refactor/riir

2025-11-14 01:03:30 -05:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: vitrine/wmaker#8

Allow edits from maintainers