Add timed_write and timed_writev

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 93 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index df98b82..06bc7f8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ In 2.14.4.0
 -----------
 
  - Documentation fixes. (This file, in particular.)
- - New functions: buffer_timed_getv, buffer_timed_putv, timed_read, timed_readv
+ - New functions: buffer_timed_getv, buffer_timed_putv,
+   timed_read, timed_readv, timed_Write, timed_writev
 
 
 In 2.14.3.0
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 57b81c3..147eafa 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -20,7 +20,8 @@
 
 <ul>
  <li> New <tt>buffer_timed_getv</tt>, <tt>buffer_timed_putv</tt>,
-<tt>timed_read</tt> and <tt>timed_readv</tt> functions. </li>
+<tt>timed_read</tt> and <tt>timed_readv</tt>,
+<tt>timed_write</tt> and <tt>timed_writev</tt> functions. </li>
 </ul>
 
 <h2> in 2.14.3.0 </h2>
diff --git a/package/deps.mak b/package/deps.mak
index 5061f02..a69e12d 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -833,6 +833,8 @@ src/libunixonacid/timed_getln.o src/libunixonacid/timed_getln.lo: src/libunixona
 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/timed_write.o src/libunixonacid/timed_write.lo: src/libunixonacid/timed_write.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h
+src/libunixonacid/timed_writev.o src/libunixonacid/timed_writev.lo: src/libunixonacid/timed_writev.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/src/include/skalibs/unix-timed.h b/src/include/skalibs/unix-timed.h
index 7243370..1ddd206 100644
--- a/src/include/skalibs/unix-timed.h
+++ b/src/include/skalibs/unix-timed.h
@@ -25,6 +25,11 @@ extern size_t timed_read (int, char *, size_t, tain const *, tain *) ;
 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 size_t timed_write (int, char const *, size_t, tain const *, tain *) ;
+#define timed_write_g(fd, s, len, deadline) timed_write(fd, s, len, (deadline), &STAMP)
+extern size_t timed_writev (int, struct iovec const *, unsigned int, tain const *, tain *) ;
+#define timed_writev_g(fd, v, vlen, deadline) timed_writev(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 *) ;
diff --git a/src/libunixonacid/timed_write.c b/src/libunixonacid/timed_write.c
new file mode 100644
index 0000000..dc86d8f
--- /dev/null
+++ b/src/libunixonacid/timed_write.c
@@ -0,0 +1,39 @@
+/* ISC license. */
+
+#include <unistd.h>
+
+#include <skalibs/functypes.h>
+#include <skalibs/allreadwrite.h>
+#include <skalibs/unix-timed.h>
+
+struct blah_s
+{
+  int fd ;
+  char const *s ;
+  size_t len ;
+  size_t w ;
+} ;
+
+static int getfd (struct blah_s *blah)
+{
+  return blah->fd ;
+}
+
+static int isnonempty (struct blah_s *blah)
+{
+  return blah->w < blah->len ;
+}
+
+static int flush (struct blah_s *blah)
+{
+  ssize_t r = fd_write(blah->fd, blah->s + blah->w, blah->len - blah->w) ;
+  if (r > 0) blah->w += r ;
+  return r > 0 ;
+}
+
+size_t timed_write (int fd, char const *s, size_t len, tain const *deadline, tain *stamp)
+{
+  struct blah_s blah = { .fd = fd, .s = s, .len = len, .w = 0 } ;
+  timed_flush(&blah, (init_func_ref)&getfd, (init_func_ref)&isnonempty, (init_func_ref)&flush, deadline, stamp) ;
+  return blah.w ;
+}
diff --git a/src/libunixonacid/timed_writev.c b/src/libunixonacid/timed_writev.c
new file mode 100644
index 0000000..7542d27
--- /dev/null
+++ b/src/libunixonacid/timed_writev.c
@@ -0,0 +1,43 @@
+/* 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 ;
+} ;
+
+static int getfd (struct blah_s *blah)
+{
+  return blah->fd ;
+}
+
+static int isnonempty (struct blah_s *blah)
+{
+  return !!siovec_len(blah->v, blah->vlen) ;
+}
+
+static int flush (struct blah_s *blah)
+{
+  ssize_t r = fd_writev(blah->fd, blah->v, blah->vlen) ;
+  if (r > 0) siovec_seek(blah->v, blah->vlen, r) ;
+  return r > 0 ;
+}
+
+size_t timed_writev (int fd, struct iovec const *srcv, unsigned int vlen, tain const *deadline, tain *stamp)
+{
+  size_t len = siovec_len(srcv, vlen) ;
+  if (!len) return 0 ;
+  struct iovec v[vlen] ;
+  struct blah_s blah = { .fd = fd, .v = v, .vlen = vlen } ;
+  for (unsigned int i = 0 ; i < vlen ; i++) v[i] = srcv[i] ;
+  timed_flush(&blah, (init_func_ref)&getfd, (init_func_ref)&isnonempty, (init_func_ref)&flush, deadline, stamp) ;
+  return len - siovec_len(v, vlen) ;
+}