diff options
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/license.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rw-r--r-- | package/deps.mak | 4 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/include/skalibs/unix-timed.h | 12 | ||||
| -rw-r--r-- | src/libunixonacid/buffer_timed_getv.c | 32 | ||||
| -rw-r--r-- | src/libunixonacid/buffer_timed_putv.c | 22 | ||||
| -rw-r--r-- | src/libunixonacid/timed_read.c | 34 | ||||
| -rw-r--r-- | src/libunixonacid/timed_readv.c | 38 |
12 files changed, 163 insertions, 9 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2011-2024 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2011-2025 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -1,7 +1,14 @@ Changelog for skalibs. -In 2.4.3.0 ----------- +In 2.14.4.0 +----------- + + - Documentation fixes. (This file, in particular.) + - New functions: buffer_timed_getv, buffer_timed_putv, timed_read, timed_readv + + +In 2.14.3.0 +----------- - Bugfixes. - Newish function: mininetstring_read(). @@ -10,8 +17,8 @@ In 2.4.3.0 - Install .a to /usr/lib by default. -In 2.4.2.0 ----------- +In 2.14.2.0 +----------- - Support for midipix and old MacOS X. (More sysdeps.) - New gol.h header (a take on getopt_long). diff --git a/doc/index.html b/doc/index.html index 8b82012..f7a2c56 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@ with a standard C development environment </li> <h3> Download </h3> <ul> - <li> The current released version of skalibs is <a href="skalibs-2.14.3.0.tar.gz">2.14.3.0</a>. </li> + <li> The current released version of skalibs is <a href="skalibs-2.14.4.0.tar.gz">2.14.4.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/skalibs/">skalibs git repository</a>: diff --git a/doc/license.html b/doc/license.html index 5a19ec1..e10a595 100644 --- a/doc/license.html +++ b/doc/license.html @@ -74,7 +74,7 @@ color, or different text font. </li> <p> <em>I am aware that the previous restrictions sound completely ridiculous while the official skalibs documentation is incomplete. -As of 2.14.3.0, I'm not going to enforce those restrictions, but if you're +As of 2.14.4.0, I'm not going to enforce those restrictions, but if you're going to provide documentation for skalibs, don't keep it to yourself, please send it to me instead. :-) </em> </p> diff --git a/doc/upgrade.html b/doc/upgrade.html index 9f1c24a..57b81c3 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -16,6 +16,13 @@ <a href="//skarnet.org/">skarnet.org</a> </p> +<h2> in 2.14.4.0 </h2> + +<ul> + <li> New <tt>buffer_timed_getv</tt>, <tt>buffer_timed_putv</tt>, +<tt>timed_read</tt> and <tt>timed_readv</tt> functions. </li> +</ul> + <h2> in 2.14.3.0 </h2> <ul> diff --git a/package/deps.mak b/package/deps.mak index 7fca3ab..5061f02 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -740,8 +740,10 @@ src/libunixonacid/bufalloc_timed_flush.o src/libunixonacid/bufalloc_timed_flush. src/libunixonacid/buffer_timed_fill.o src/libunixonacid/buffer_timed_fill.lo: src/libunixonacid/buffer_timed_fill.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_flush.o src/libunixonacid/buffer_timed_flush.lo: src/libunixonacid/buffer_timed_flush.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_get.o src/libunixonacid/buffer_timed_get.lo: src/libunixonacid/buffer_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h +src/libunixonacid/buffer_timed_getv.o src/libunixonacid/buffer_timed_getv.lo: src/libunixonacid/buffer_timed_getv.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_put.o src/libunixonacid/buffer_timed_put.lo: src/libunixonacid/buffer_timed_put.c src/include/skalibs/buffer.h src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_puts.o src/libunixonacid/buffer_timed_puts.lo: src/libunixonacid/buffer_timed_puts.c src/include/skalibs/unix-timed.h +src/libunixonacid/buffer_timed_putv.o src/libunixonacid/buffer_timed_putv.lo: src/libunixonacid/buffer_timed_putv.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/unix-timed.h src/libunixonacid/ipc_timed_recv.o src/libunixonacid/ipc_timed_recv.lo: src/libunixonacid/ipc_timed_recv.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/socket.h src/include/skalibs/unix-timed.h src/libunixonacid/ipc_timed_send.o src/libunixonacid/ipc_timed_send.lo: src/libunixonacid/ipc_timed_send.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/unix-timed.h src/libunixonacid/ipc_timed_sendv.o src/libunixonacid/ipc_timed_sendv.lo: src/libunixonacid/ipc_timed_sendv.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/siovec.h src/include/skalibs/unix-timed.h @@ -829,6 +831,8 @@ src/libunixonacid/timed_flush.o src/libunixonacid/timed_flush.lo: src/libunixona src/libunixonacid/timed_get.o src/libunixonacid/timed_get.lo: src/libunixonacid/timed_get.c src/include/skalibs/allreadwrite.h src/include/skalibs/iopause.h src/include/skalibs/unix-timed.h src/libunixonacid/timed_getln.o src/libunixonacid/timed_getln.lo: src/libunixonacid/timed_getln.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/include/skalibs/unix-timed.h src/libunixonacid/timed_getlnmax.o src/libunixonacid/timed_getlnmax.lo: src/libunixonacid/timed_getlnmax.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/unix-timed.h +src/libunixonacid/timed_read.o src/libunixonacid/timed_read.lo: src/libunixonacid/timed_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h +src/libunixonacid/timed_readv.o src/libunixonacid/timed_readv.lo: src/libunixonacid/timed_readv.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/siovec.h src/include/skalibs/unix-timed.h src/libunixonacid/unixconnection_free.o src/libunixonacid/unixconnection_free.lo: src/libunixonacid/unixconnection_free.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h src/libunixonacid/unixconnection_init.o src/libunixonacid/unixconnection_init.lo: src/libunixonacid/unixconnection_init.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h src/libunixonacid/unixconnection_init_withclosecb.o src/libunixonacid/unixconnection_init_withclosecb.lo: src/libunixonacid/unixconnection_init_withclosecb.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h diff --git a/package/info b/package/info index 49f061c..966efc6 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=skalibs -version=2.14.3.0 +version=2.14.4.0 category=prog package_macro_name=SKALIBS diff --git a/src/include/skalibs/unix-timed.h b/src/include/skalibs/unix-timed.h index be79056..7243370 100644 --- a/src/include/skalibs/unix-timed.h +++ b/src/include/skalibs/unix-timed.h @@ -20,16 +20,26 @@ extern int timed_flush (void *, init_func_ref, init_func_ref, init_func_ref, tai extern ssize_t timed_get (void *, init_func_ref, get_func_ref, tain const *, tain *) ; #define timed_get_g (b, getfd, get, deadline) timed_get(b, getfd, get, (deadline), &STAMP) +extern size_t timed_read (int, char *, size_t, tain const *, tain *) ; +#define timed_read_g(fd, s, len, deadline) timed_read(fd, s, len, (deadline), &STAMP) +extern size_t timed_readv (int, struct iovec *, unsigned int, tain const *, tain *) ; +#define timed_readv_g(fd, v, vlen, deadline) timed_readv(fd, v, vlen, (deadline), &STAMP) + extern ssize_t buffer_timed_fill (buffer *, tain const *, tain *) ; #define buffer_timed_fill_g(b, deadline) buffer_timed_fill(b, (deadline), &STAMP) extern int bufalloc_timed_flush (bufalloc *, tain const *, tain *) ; #define bufalloc_timed_flush_g(ba, deadline) bufalloc_timed_flush(ba, (deadline), &STAMP) extern int buffer_timed_flush (buffer *, tain const *, tain *) ; #define buffer_timed_flush_g(b, deadline) buffer_timed_flush(b, (deadline), &STAMP) + extern size_t buffer_timed_get (buffer *, char *, size_t, tain const *, tain *) ; -#define buffer_timed_get_g(b, buf, buflen, deadline) buffer_timed_get(b, buf, buflen, (deadline), &STAMP) +#define buffer_timed_get_g(b, s, len, deadline) buffer_timed_get(b, s, len, (deadline), &STAMP) +extern size_t buffer_timed_getv (buffer *, struct iovec *, unsigned int, tain const *, tain *) ; +#define buffer_timed_getv_g(b, v, vlen, deadline) buffer_timed_getv(b, v, vlen, (deadline), &STAMP) extern size_t buffer_timed_put (buffer *, char const *, size_t, tain const *, tain *) ; #define buffer_timed_put_g(b, s, len, deadline) buffer_timed_put(b, s, len, (deadline), &STAMP) +extern size_t buffer_timed_putv (buffer *, struct iovec const *, unsigned int, tain const *, tain *) ; +#define buffer_timed_putv_g(b, v, vlen, deadline) buffer_timed_putv(b, v, vlen, (deadline), &STAMP) extern size_t buffer_timed_puts (buffer *, char const *, tain const *, tain *) ; #define buffer_timed_puts_g(b, s, deadline) buffer_timed_puts(b, s, (deadline), &STAMP) diff --git a/src/libunixonacid/buffer_timed_getv.c b/src/libunixonacid/buffer_timed_getv.c new file mode 100644 index 0000000..ee1de79 --- /dev/null +++ b/src/libunixonacid/buffer_timed_getv.c @@ -0,0 +1,32 @@ +/* ISC license. */ + +#include <sys/uio.h> + +#include <skalibs/functypes.h> +#include <skalibs/buffer.h> +#include <skalibs/unix-timed.h> + +struct blah_s +{ + buffer *b ; + struct iovec *v ; + unsigned int n ; + size_t w ; +} ; + +static int getfd (struct blah_s *blah) +{ + return buffer_fd(blah->b) ; +} + +static ssize_t get (struct blah_s *blah) +{ + return buffer_getvall(blah->b, blah->v, blah->n, &blah->w) ; +} + +size_t buffer_timed_getv (buffer *b, struct iovec *v, unsigned int n, tain const *deadline, tain *stamp) +{ + struct blah_s blah = { .b = b, .v = v, .n = n, .w = 0 } ; + timed_get(&blah, (init_func_ref)&getfd, (get_func_ref)&get, deadline, stamp) ; + return blah.w ; +} diff --git a/src/libunixonacid/buffer_timed_putv.c b/src/libunixonacid/buffer_timed_putv.c new file mode 100644 index 0000000..0dfd56a --- /dev/null +++ b/src/libunixonacid/buffer_timed_putv.c @@ -0,0 +1,22 @@ +/* ISC license. */ + +#include <sys/uio.h> + +#include <skalibs/buffer.h> +#include <skalibs/siovec.h> +#include <skalibs/unix-timed.h> + +size_t buffer_timed_putv (buffer *b, struct iovec const *v, unsigned int vlen, tain const *deadline, tain *stamp) +{ + if (!vlen) return 0 ; + size_t tot = siovec_len(v, vlen), w = 0 ; + struct iovec vv[vlen] ; + for (unsigned int i = 0 ; i < vlen ; i++) vv[i] = v[i] ; + while (w < tot) + { + size_t r = buffer_putvnoflush(b, vv, vlen) ; + w += r ; siovec_seek(vv, vlen, r) ; + if (!buffer_timed_flush(b, deadline, stamp)) break ; + } + return w ; +} diff --git a/src/libunixonacid/timed_read.c b/src/libunixonacid/timed_read.c new file mode 100644 index 0000000..0c9a5cf --- /dev/null +++ b/src/libunixonacid/timed_read.c @@ -0,0 +1,34 @@ +/* ISC license. */ + +#include <unistd.h> + +#include <skalibs/functypes.h> +#include <skalibs/allreadwrite.h> +#include <skalibs/unix-timed.h> + +struct blah_s +{ + int fd ; + char *s ; + size_t len ; + size_t w ; +} ; + +static int getfd (struct blah_s *blah) +{ + return blah->fd ; +} + +static ssize_t get (struct blah_s *blah) +{ + ssize_t r = fd_read(blah->fd, blah->s + blah->w, blah->len - blah->w) ; + if (r > 0) blah->w += r ; + return r ; +} + +size_t timed_read (int fd, char *s, size_t len, tain const *deadline, tain *stamp) +{ + struct blah_s blah = { .fd = fd, .s = s, .len = len, .w = 0 } ; + timed_get(&blah, (init_func_ref)&getfd, (get_func_ref)&get, deadline, stamp) ; + return blah.w ; +} diff --git a/src/libunixonacid/timed_readv.c b/src/libunixonacid/timed_readv.c new file mode 100644 index 0000000..606a70f --- /dev/null +++ b/src/libunixonacid/timed_readv.c @@ -0,0 +1,38 @@ +/* ISC license. */ + +#include <sys/uio.h> + +#include <skalibs/functypes.h> +#include <skalibs/allreadwrite.h> +#include <skalibs/siovec.h> +#include <skalibs/unix-timed.h> + +struct blah_s +{ + int fd ; + struct iovec *v ; + unsigned int vlen ; + size_t w ; +} ; + +static int getfd (struct blah_s *blah) +{ + return blah->fd ; +} + +static ssize_t get (struct blah_s *blah) +{ + ssize_t r = fd_readv(blah->fd, blah->v, blah->vlen) ; + if (r > 0) { blah->w += r ; siovec_seek(blah->v, blah->vlen, r) ; } + return r ; +} + +size_t timed_readv (int fd, struct iovec *v, unsigned int vlen, tain const *deadline, tain *stamp) +{ + if (!vlen || !siovec_len(v, vlen)) return 0 ; + struct iovec vv[vlen] ; + struct blah_s blah = { .fd = fd, .v = vv, .vlen = vlen, .w = 0 } ; + for (unsigned int i = 0 ; i < vlen ; i++) vv[i] = v[i] ; + timed_get(&blah, (init_func_ref)&getfd, (get_func_ref)&get, deadline, stamp) ; + return blah.w ; +} |