summaryrefslogtreecommitdiff
path: root/libhw_generic
diff options
context:
space:
mode:
Diffstat (limited to 'libhw_generic')
-rw-r--r--libhw_generic/CMakeLists.txt4
-rw-r--r--libhw_generic/alarmclock.c18
-rw-r--r--libhw_generic/include/libhw/generic/io.h28
-rw-r--r--libhw_generic/io.c98
l---------libhw_generic/tests/test.h1
-rw-r--r--libhw_generic/tests/test_io.c57
6 files changed, 186 insertions, 20 deletions
diff --git a/libhw_generic/CMakeLists.txt b/libhw_generic/CMakeLists.txt
index e38fbe9..5a6014b 100644
--- a/libhw_generic/CMakeLists.txt
+++ b/libhw_generic/CMakeLists.txt
@@ -8,10 +8,12 @@ target_include_directories(libhw_generic SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE
target_link_libraries(libhw_generic INTERFACE
libmisc
libobj
- libcr
)
target_sources(libhw_generic INTERFACE
alarmclock.c
+ io.c
net.c
)
+
+add_lib_test(libhw_generic test_io)
diff --git a/libhw_generic/alarmclock.c b/libhw_generic/alarmclock.c
index 7fd049e..31fbbaf 100644
--- a/libhw_generic/alarmclock.c
+++ b/libhw_generic/alarmclock.c
@@ -1,25 +1,9 @@
-/* libhw_generic/alarmclock.c - Device-independent <libhw/generic/alarmclock.h> utilities
+/* libhw_generic/alarmclock.c - Device-independent <libhw/generic/alarmclock.h> storage
*
* Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-#include <libcr/coroutine.h>
-
#include <libhw/generic/alarmclock.h>
lo_interface alarmclock bootclock = {0};
-
-static void alarmclock_sleep_intrhandler(void *_arg) {
- cid_t cid = *(cid_t *)_arg;
- cr_unpause_from_intrhandler(cid);
-}
-
-void alarmclock_sleep_until_ns(lo_interface alarmclock clock, uint64_t abstime_ns) {
- bool saved = cr_save_and_disable_interrupts();
- cid_t cid = cr_getcid();
- struct alarmclock_trigger trigger;
- LO_CALL(clock, add_trigger, &trigger, abstime_ns, alarmclock_sleep_intrhandler, &cid);
- cr_pause_and_yield();
- cr_restore_interrupts(saved);
-}
diff --git a/libhw_generic/include/libhw/generic/io.h b/libhw_generic/include/libhw/generic/io.h
index a7f7378..7825c9f 100644
--- a/libhw_generic/include/libhw/generic/io.h
+++ b/libhw_generic/include/libhw/generic/io.h
@@ -8,6 +8,7 @@
#define _LIBHW_GENERIC_IO_H_
#include <stddef.h> /* for size_t */
+#include <stdint.h> /* for uintptr_t */
#include <sys/types.h> /* for ssize_t */
#include <libobj/obj.h>
@@ -23,12 +24,35 @@ struct iovec {
};
#endif
+#define IOVEC_DISCARD ((void*)(~((uintptr_t)0)))
+
struct duplex_iovec {
- void *iov_read_dst;
- void *iov_write_src;
+ /**
+ * NULL is a valid pointer value in iov_read_to and
+ * iov_write_from. To skip a read or write, use the special
+ * value IOVEC_DISCARD.
+ */
+ void *iov_read_to;
+ void *iov_write_from;
size_t iov_len;
};
+/* utilities ******************************************************************/
+
+/* slice iovec lists */
+int io_slice_cnt ( const struct iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+void io_slice (struct iovec *dst, const struct iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+int io_duplex_slice_cnt( const struct duplex_iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+void io_duplex_slice (struct duplex_iovec *dst, const struct duplex_iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+
+/* convert iovec lists */
+void io_rd_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int iovcnt);
+void io_wr_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int iovcnt);
+
+/* slice and convert in one go */
+void io_slice_rd_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+void io_slice_wr_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int src_cnt, size_t byte_start, size_t byte_max_cnt);
+
/* basic interfaces ***********************************************************/
/**
diff --git a/libhw_generic/io.c b/libhw_generic/io.c
new file mode 100644
index 0000000..4ebff10
--- /dev/null
+++ b/libhw_generic/io.c
@@ -0,0 +1,98 @@
+/* libhw_generic/io.c - Utilities for device-independent I/O definitions
+ *
+ * Copyright (C) 2025 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <libmisc/assert.h>
+
+#include <libhw/generic/io.h>
+
+#define IOV_ITER(ACTION) \
+ assert(src_cnt >= 0); \
+ assert(src_cnt == 0 || src); \
+ \
+ const size_t byte_end = byte_beg + byte_max_cnt; \
+ int j = 0; \
+ size_t byte_pos = 0; \
+ for (int i = 0; \
+ i < src_cnt && (byte_max_cnt == 0 || byte_pos < byte_end); \
+ i++) { \
+ size_t off = 0, len; \
+ if (byte_pos < byte_beg) { \
+ if (byte_beg - byte_pos >= src[i].iov_len) { \
+ byte_pos += src[i].iov_len; \
+ continue; \
+ } \
+ off = byte_beg-byte_pos; \
+ len = src[i].iov_len-off; \
+ byte_pos = byte_beg; \
+ } else { \
+ len = src[i].iov_len; \
+ } \
+ if (byte_max_cnt && byte_end - byte_pos < len) \
+ len = byte_end - byte_pos; \
+ do { ACTION } while (0); \
+ byte_pos += len; \
+ j++; \
+ }
+
+int io_slice_cnt(const struct iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ IOV_ITER();
+ return j;
+}
+
+int io_duplex_slice_cnt(const struct duplex_iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ IOV_ITER();
+ return j;
+}
+
+void io_slice(struct iovec *dst, const struct iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ assert(src_cnt == 0 || dst);
+ IOV_ITER(
+ dst[j] = ((struct iovec){
+ .iov_base = src[i].iov_base+off,
+ .iov_len = len,
+ });
+ );
+}
+void io_slice_duplex(struct duplex_iovec *dst, const struct duplex_iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ assert(src_cnt == 0 || dst);
+ IOV_ITER(
+ dst[j] = ((struct duplex_iovec){
+ .iov_read_to = src[i].iov_read_to+off,
+ .iov_write_from = src[i].iov_write_from+off,
+ .iov_len = len,
+ });
+ );
+}
+
+void io_slice_rd_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ assert(src_cnt == 0 || dst);
+ IOV_ITER(
+ dst[j] = ((struct duplex_iovec){
+ .iov_read_to = src[i].iov_base+off,
+ .iov_write_from = IOVEC_DISCARD,
+ .iov_len = len,
+ });
+ );
+}
+
+void io_slice_wr_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int src_cnt, size_t byte_beg, size_t byte_max_cnt) {
+ assert(src_cnt == 0 || dst);
+ IOV_ITER(
+ dst[j] = ((struct duplex_iovec){
+ .iov_read_to = IOVEC_DISCARD,
+ .iov_write_from = src[i].iov_base+off,
+ .iov_len = len,
+ });
+ );
+}
+
+void io_rd_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int iovcnt) {
+ io_slice_rd_to_duplex(dst, src, iovcnt, 0, 0);
+}
+
+void io_wr_to_duplex(struct duplex_iovec *dst, const struct iovec *src, int iovcnt) {
+ io_slice_wr_to_duplex(dst, src, iovcnt, 0, 0);
+}
diff --git a/libhw_generic/tests/test.h b/libhw_generic/tests/test.h
new file mode 120000
index 0000000..2fb1bd5
--- /dev/null
+++ b/libhw_generic/tests/test.h
@@ -0,0 +1 @@
+../../libmisc/tests/test.h \ No newline at end of file
diff --git a/libhw_generic/tests/test_io.c b/libhw_generic/tests/test_io.c
new file mode 100644
index 0000000..0d6df11
--- /dev/null
+++ b/libhw_generic/tests/test_io.c
@@ -0,0 +1,57 @@
+/* libhw_generic/tests/test_io.c - Tests for <libmisc/io.h>
+ *
+ * Copyright (C) 2025 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <string.h>
+
+#include <libhw/generic/io.h>
+
+#include "test.h"
+
+int main() {
+ char data[] = "abcdefghijklmnopqrstuvwxyz";
+ struct iovec src[] = {
+ {.iov_base = &data[1], .iov_len=3}, /* "bcd" */
+ {.iov_base = &data[20], .iov_len=4}, /* "uvwx" */
+ };
+ const int src_cnt = sizeof(src)/sizeof(src[0]);
+
+ struct duplex_iovec dst[2];
+
+#define TC(start, max, ...) do { \
+ char *exp[] = {__VA_ARGS__}; \
+ int exp_cnt = sizeof(exp)/sizeof(exp[0]); \
+ int act_cnt = io_slice_cnt(src, src_cnt, start, max); \
+ test_assert(act_cnt == exp_cnt); \
+ memset(dst, 0, sizeof(dst)); \
+ io_slice_wr_to_duplex(dst, src, src_cnt, start, max); \
+ for (int i = 0; i < act_cnt; i++) { \
+ test_assert(dst[i].iov_read_to == IOVEC_DISCARD); \
+ test_assert(dst[i].iov_write_from != IOVEC_DISCARD); \
+ test_assert(dst[i].iov_len == strlen(exp[i])); \
+ test_assert(memcmp(dst[i].iov_write_from, exp[i], dst[i].iov_len) == 0); \
+ } \
+ } while (0)
+
+ TC(0, 0, /* => */ "bcd", "uvwx");
+ TC(1, 0, /* => */ "cd", "uvwx");
+ TC(2, 0, /* => */ "d", "uvwx");
+ TC(3, 0, /* => */ "uvwx");
+ TC(4, 0, /* => */ "vwx");
+ TC(5, 0, /* => */ "wx");
+ TC(6, 0, /* => */ "x");
+ TC(7, 0, /* => */ );
+
+ TC(0, 2, /* => */ "bc");
+ TC(1, 2, /* => */ "cd");
+ TC(2, 2, /* => */ "d", "u");
+ TC(3, 2, /* => */ "uv");
+ TC(4, 2, /* => */ "vw");
+ TC(5, 2, /* => */ "wx");
+ TC(6, 2, /* => */ "x");
+ TC(7, 2, /* => */ );
+
+ return 0;
+}
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2025-04-04 20:05:02 +0000