[PATCH v2 0/5] reftable: some more portability improvements
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Apr 2, 2026, 07:31 UTC
- Message-ID
- <20260402-pks-reftable-portability-fixes-v2-0-bc110cee0ae0@pks.im>
- In-Reply-To
- <20260331-pks-reftable-portability-fixes-v1-0-46bfae55c68c@pks.im>
Hi,
this patch series contains the last set of portability improvements that currently sits in the reftable implementation of libgit2. With these patches merged lbigit2 is able to fully reuse the reftable library while only having to provide its own system headers.
I've got a test run with libgit2 at [1], the code in Git is tested at [2]. Overall we're quite close -- the pull requests to implement the repository extension and to adjust handling of pseudo-refs have been merged. Still missing is a couple of test fixes, but once those are merged the reftable backend itself will be in review.
Changes in v2:
- Reorder commits a bit so that we introduce "reftable-system.h" early
on.
- Make the split between "reftable-system.h" and "system.h" cleaner
and explain it better.
- Drop the `REFTABLE_INLINE()` patch. I can work around it in libgit2
itself.
- Drop the fsync callback and instead require it to exist, so that we
can do some macro magic to use our own `fsync_component()` instead.
- Rebased the libgit2 changes on top of this series to verify that
we're still moving into the right direction.
- Link to v1: https://patch.msgid.link/20260331-pks-reftable-portability-fixes-v1-0-46bfae55c68c@pks.imThanks!
Patrick
[1]: https://github.com/libgit2/libgit2/pull/7117 [2]: https://gitlab.com/gitlab-org/git/-/merge_requests/535
---
Patrick Steinhardt (5):
reftable: introduce "reftable-system.h" header
reftable/stack: provide fsync(3p) via system header
reftable/fsck: use REFTABLE_UNUSED instead of UNUSED
reftable/system: add abstraction to retrieve time in milliseconds
reftable/system: add abstraction to mmap filesrefs/reftable-backend.c | 6 ------ reftable/blocksource.c | 19 +++++++------------ reftable/fsck.c | 2 +- reftable/reftable-basics.h | 2 +- reftable/reftable-block.h | 3 +-- reftable/reftable-blocksource.h | 2 +- reftable/reftable-error.h | 2 ++ reftable/reftable-fsck.h | 1 + reftable/reftable-iterator.h | 1 + reftable/reftable-merged.h | 1 + reftable/reftable-record.h | 2 +- reftable/reftable-stack.h | 1 + reftable/reftable-system.h | 18 ++++++++++++++++++ reftable/reftable-table.h | 1 + reftable/reftable-writer.h | 10 +--------- reftable/stack.c | 40 +++++++--------------------------------- reftable/system.c | 32 ++++++++++++++++++++++++++++++++ reftable/system.h | 32 ++++++++++++++++++++++++++++---- 18 files changed, 105 insertions(+), 70 deletions(-)
Range-diff versus v1:
1: 77c23e530a < -: ---------- reftable/system: provide `REFTABLE_INLINE()` macro
2: a32aeffa92 < -: ---------- reftable/stack: don't call fsync(3p) unless provided
6: 5413397e77 ! 1: 11f69c228e reftable: introduce "reftable-system.h" header
@@ Commit message
headers relevant to us.
Introduce a new "reftable-system.h" header that allows projects to
- provide their own headers.
+ provide their own headers. This new header is supposed to contain all
+ the project-specific bits to provide the POSIX-like environment, and some
+ additional supporting code. With this change, we thus have the following
+ split in our system-specific code:
+
+ - "reftable/reftable-system.h" is the project-specific header that
+ provides a POSIX-like environment. Every project is expected to
+ provide their own implementation.
+
+ - "reftable/system.h" contains the project-independent definition of
+ the interfaces that a project needs to implement. This file should
+ not be touched by a project.
+
+ - "reftable/system.c" contains the project-specific implementation of
+ the interfaces defined in "system.h". Again, every project is
+ expected to provide their own implementation.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
@@ reftable/reftable-system.h (new)
+#ifndef REFTABLE_SYSTEM_H
+#define REFTABLE_SYSTEM_H
+
++/*
++ * This header defines the platform-specific bits required to compile the
++ * reftable library. It should provide an environment that bridges over the
++ * gaps between POSIX and your system, as well as the zlib interfaces. This
++ * header is expected to be changed by the individual project.
++ */
++
+#define MINGW_DONT_HANDLE_IN_USE_ERROR
+#include "compat/posix.h"
++#include "compat/zlib-compat.h"
+
+#endif
@@ reftable/reftable-writer.h
## reftable/system.h ##
@@
+ #ifndef SYSTEM_H
+ #define SYSTEM_H
- /* This header glues the reftable library to the rest of Git */
+-/* This header glues the reftable library to the rest of Git */
++/*
++ * This header defines the platform-agnostic interface that is to be
++ * implemented by the project to make it work on their respective supported
++ * systems, and to integrate it into the project itself. This header is not
++ * expected to be changed by the individual project.
++ */
-#define MINGW_DONT_HANDLE_IN_USE_ERROR
-#include "compat/posix.h"
+-#include "compat/zlib-compat.h"
+#include "reftable-system.h"
- #include "compat/zlib-compat.h"
- #define REFTABLE_INLINE(type) static inline type
+ /*
+ * Return a random 32 bit integer. This function is expected to return
-: ---------- > 2: 422c12955e reftable/stack: provide fsync(3p) via system header
3: 94bd6cae41 = 3: 73fa205b5a reftable/fsck: use REFTABLE_UNUSED instead of UNUSED
4: ea5aa25f71 ! 4: 139583e68a reftable/system: add abstraction to retrieve time in milliseconds
@@ reftable/system.c
#include "../lockfile.h"
+#include "../trace.h"
#include "../tempfile.h"
+ #include "../write-or-die.h"
- uint32_t reftable_rand(void)
-@@ reftable/system.c: int flock_commit(struct reftable_flock *l)
-
- return 0;
+@@ reftable/system.c: int reftable_fsync(int fd)
+ {
+ return fsync_component(FSYNC_COMPONENT_REFERENCE, fd);
}
+
+uint64_t reftable_time_ms(void)
5: 27d055eecd = 5: a445a6e6eb reftable/system: add abstraction to mmap files--- base-commit: 270e10ad6dda3379ea0da7efd11e4fbf2cd7a325 change-id: 20260330-pks-reftable-portability-fixes-36ebf9f227c2