Prepare for 2.15.2.0HEADmain

 Add pthread_create_flat, waitpid_nohang, waitpids_nohang

12 files changed, 115 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 79580f6..2cc65ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
 Changelog for skalibs.
 
+In 2.15.2.0
+-----------
+
+ - Bugfixes.
+ - New libplaynice function: pthread_create_flat
+   (to avoid mallocing the arg when creating a thread)
+ - New functions: waitpid_nohang, waitpids_nohang
+   (to only reap the listed pids and ignore others)
+
+
 In 2.15.1.0
 -----------
 
diff --git a/doc/index.html b/doc/index.html
index 69bf6d7..4980b35 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,8 +61,8 @@ with a standard C development environment </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of skalibs is <a href="skalibs-2.15.1.0.tar.gz">2.15.1.0</a>.
-You can access its checksum <a href="skalibs-2.15.1.0.tar.gz.sha256">here</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.15.2.0.tar.gz">2.15.2.0</a>.
+You can access its checksum <a href="skalibs-2.15.2.0.tar.gz.sha256">here</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgit/skalibs/">skalibs
 git repository</a>:
diff --git a/doc/license.html b/doc/license.html
index 348597a..e92da26 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -75,7 +75,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.15.1.0, I'm not going to enforce those restrictions, but if you're
+As of 2.15.2.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 571c272..74e9776 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -17,6 +17,12 @@
 <a href="//skarnet.org/">skarnet.org</a>
 </p>
 
+<h2> in 2.15.2.0 </h2>
+
+<ul>
+ <li> New functions: pthread_create_flat, waitpid_nohang, waitpids_nohang </li>
+</ul>
+
 <h2> in 2.15.1.0 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index ab5fc6f..8d96297 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -183,9 +183,10 @@ src/libenvexec/xmexec_afn.o src/libenvexec/xmexec_afn.lo: src/libenvexec/xmexec_
 src/libenvexec/xmspawn_af.o src/libenvexec/xmspawn_af.lo: src/libenvexec/xmspawn_af.c src/include/skalibs/cspawn.h src/include/skalibs/strerr.h
 src/libenvexec/xmspawn_afm.o src/libenvexec/xmspawn_afm.lo: src/libenvexec/xmspawn_afm.c src/include/skalibs/cspawn.h src/include/skalibs/strerr.h
 src/libenvexec/xmspawn_afn.o src/libenvexec/xmspawn_afn.lo: src/libenvexec/xmspawn_afn.c src/include/skalibs/cspawn.h src/include/skalibs/strerr.h
-src/libplaynice/keventbridge_end.o src/libplaynice/keventbridge_end.lo: src/libplaynice/keventbridge_end.c src/include/skalibs/djbunix.h src/include/skalibs/keventbridge.h src/include/skalibs/sysdeps.h
-src/libplaynice/keventbridge_read.o src/libplaynice/keventbridge_read.lo: src/libplaynice/keventbridge_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/keventbridge.h src/include/skalibs/sysdeps.h
+src/libplaynice/keventbridge_end.o src/libplaynice/keventbridge_end.lo: src/libplaynice/keventbridge_end.c src/include/skalibs/djbunix.h src/include/skalibs/keventbridge.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
+src/libplaynice/keventbridge_read.o src/libplaynice/keventbridge_read.lo: src/libplaynice/keventbridge_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/keventbridge.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
 src/libplaynice/keventbridge_start.o src/libplaynice/keventbridge_start.lo: src/libplaynice/keventbridge_start.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/keventbridge.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
+src/libplaynice/pthread_create_flat.o src/libplaynice/pthread_create_flat.lo: src/libplaynice/pthread_create_flat.c src/include/skalibs/functypes.h src/include/skalibs/sysdeps.h
 src/libposixplz/bsearchr.o src/libposixplz/bsearchr.lo: src/libposixplz/bsearchr.c src/include/skalibs/functypes.h src/include/skalibs/posixplz.h
 src/libposixplz/doublefork.o src/libposixplz/doublefork.lo: src/libposixplz/doublefork.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/posixplz.h src/include/skalibs/uint64.h
 src/libposixplz/execvep.o src/libposixplz/execvep.lo: src/libposixplz/execvep.c src/libposixplz/posixplz-internal.h src/include/skalibs/posixplz.h
@@ -763,6 +764,7 @@ src/libstddjb/waitn_posix.o src/libstddjb/waitn_posix.lo: src/libstddjb/waitn_po
 src/libstddjb/waitn_reap.o src/libstddjb/waitn_reap.lo: src/libstddjb/waitn_reap.c src/include/skalibs/djbunix.h
 src/libstddjb/waitn_reap_posix.o src/libstddjb/waitn_reap_posix.lo: src/libstddjb/waitn_reap_posix.c src/include/skalibs/djbunix.h
 src/libstddjb/waitpid_nointr.o src/libstddjb/waitpid_nointr.lo: src/libstddjb/waitpid_nointr.c src/include/skalibs/djbunix.h
+src/libstddjb/waitpids_nohang.o src/libstddjb/waitpids_nohang.lo: src/libstddjb/waitpids_nohang.c src/include/skalibs/djbunix.h
 src/libstddjb/writenclose_unsafe5.o src/libstddjb/writenclose_unsafe5.lo: src/libstddjb/writenclose_unsafe5.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h
 src/libstddjb/writevnclose_unsafe5.o src/libstddjb/writevnclose_unsafe5.lo: src/libstddjb/writevnclose_unsafe5.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h
 src/libunixonacid/access_at.o src/libunixonacid/access_at.lo: src/libunixonacid/access_at.c src/libunixonacid/at-internal.h src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h
diff --git a/package/info b/package/info
index cb50203..ee6e127 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=skalibs
-version=2.15.1.0
+version=2.15.2.0
 category=prog
 package_macro_name=SKALIBS
diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h
index a2a0d42..d6efa09 100644
--- a/src/include/skalibs/djbunix.h
+++ b/src/include/skalibs/djbunix.h
@@ -62,9 +62,12 @@ extern size_t path_canonicalize (char *, char const *, int) ;
 extern pid_t wait_nointr (int *) ;
 extern pid_t waitpid_nointr (pid_t, int *, int) ;
 #define wait_pid(pid, wstat) waitpid_nointr(pid, (wstat), 0)
-#define wait_nohang(wstat) waitpid_nointr(-1, (wstat), WNOHANG)
+#define waitpid_nohang(pid, wstat) waitpid_nointr(pid, (wstat), WNOHANG)
+#define wait_nohang(wstat) waitpid_nohang(-1, (wstat))
 extern pid_t wait_pid_nohang (pid_t, int *) ;
 extern int wait_pids_nohang (pid_t const *, unsigned int, int *) ;
+extern int waitpids_nohang (pid_t const *, unsigned int, int *) ;
+
 #define wait_status(w) (WIFSIGNALED(w) ? 256 + WTERMSIG(w) : WEXITSTATUS(w))
 #define wait_estatus(w) (WIFSIGNALED(w) ? 128 + WTERMSIG(w) : WEXITSTATUS(w) >= 128 ? 128 : WEXITSTATUS(w))
 
diff --git a/src/include/skalibs/functypes.h b/src/include/skalibs/functypes.h
index d1a7c4c..8d21b45 100644
--- a/src/include/skalibs/functypes.h
+++ b/src/include/skalibs/functypes.h
@@ -67,4 +67,7 @@ typedef randomgen_func *randomgen_func_ref ;
 typedef int main_func (char const *const *) ;
 typedef main_func *main_func_ref ;
 
+typedef void *generic_func (void *) ;
+typedef generic_func *generic_func_ref ;
+
 #endif
diff --git a/src/libplaynice/pthread_create_flat.c b/src/libplaynice/pthread_create_flat.c
new file mode 100644
index 0000000..5c8e466
--- /dev/null
+++ b/src/libplaynice/pthread_create_flat.c
@@ -0,0 +1,56 @@
+/* ISC license. */
+
+#include <skalibs/sysdeps.h>
+
+#ifdef SKALIBS_HASPTHREAD
+
+#include <string.h>
+#include <pthread.h>
+
+#include <skalibs/functypes.h>
+
+struct spawndata_s
+{
+  pthread_cond_t cond ;
+  pthread_mutex_t mutex ;
+  generic_func_ref start ;
+  void *arg ;
+  size_t argsize ;
+} ;
+
+static void *bootstrap (void *arg)
+{
+  struct spawndata_s *data = arg ;
+  char newarg[data->argsize ? data->argsize : 1] ;
+  memcpy(newarg, data->arg, data->argsize) ;
+  int e = pthread_mutex_lock(&data->mutex) ;
+  if (e) return 0 ;
+  pthread_cond_signal(&data->cond) ;
+  pthread_mutex_unlock(&data->mutex) ;
+  return (*data->start)(newarg) ;
+}
+
+int pthread_create_flat (pthread_t *restrict th, pthread_attr_t const *restrict attr, generic_func_ref start, void *restrict arg, size_t argsize)
+{
+  struct spawndata_s data =
+  {
+    .cond = PTHREAD_COND_INITIALIZER,
+    .mutex = PTHREAD_MUTEX_INITIALIZER,
+    .start = start,
+    .arg = arg,
+    .argsize = argsize
+  } ;
+  pthread_t tth ;
+  int e = pthread_mutex_lock(&data.mutex) ;
+  if (e) return e ;
+  e = pthread_create(&tth, attr, &bootstrap, &data) ;
+  if (e) return e ;
+  e = pthread_cond_wait(&data.cond, &data.mutex) ;
+  if (e) pthread_cancel(tth) ; else *th = tth ;
+  pthread_mutex_unlock(&data.mutex) ;
+  pthread_cond_destroy(&data.cond) ;
+  pthread_mutex_destroy(&data.mutex) ;
+  return e ;
+}
+
+#endif
diff --git a/src/libstddjb/wait_pid_nohang.c b/src/libstddjb/wait_pid_nohang.c
index 7b27bbe..f22a222 100644
--- a/src/libstddjb/wait_pid_nohang.c
+++ b/src/libstddjb/wait_pid_nohang.c
@@ -3,6 +3,11 @@
 #include <sys/wait.h>
 #include <skalibs/djbunix.h>
 
+ /*
+   wait_pid_nohang (defined here): reaps everything until it gets pid
+   waitpid_nohang (macro): only tries to reap pid, doesn't touch others
+ */
+
 pid_t wait_pid_nohang (pid_t pid, int *wstat)
 {
   int w = 0 ;
diff --git a/src/libstddjb/wait_pids_nohang.c b/src/libstddjb/wait_pids_nohang.c
index c13ddec..f56c065 100644
--- a/src/libstddjb/wait_pids_nohang.c
+++ b/src/libstddjb/wait_pids_nohang.c
@@ -3,6 +3,10 @@
 #include <sys/wait.h>
 #include <skalibs/djbunix.h>
 
+ /*
+   wait_pids_nohang (with the underscore): reap everything, report if in pids
+ */
+
 int wait_pids_nohang (pid_t const *pids, unsigned int len, int *wstat)
 {
   for (;;)
diff --git a/src/libstddjb/waitpids_nohang.c b/src/libstddjb/waitpids_nohang.c
new file mode 100644
index 0000000..23f03de
--- /dev/null
+++ b/src/libstddjb/waitpids_nohang.c
@@ -0,0 +1,19 @@
+/* ISC license. */
+
+#include <sys/wait.h>
+#include <skalibs/djbunix.h>
+
+ /*
+   waitpids_nohang (defined here): only reap pids, don't touch the rest
+ */
+
+int waitpids_nohang (pid_t const *pids, unsigned int len, int *wstat)
+{
+  for (unsigned int i = 0 ; i < len ; i++)
+  {
+    pid_t r = waitpid_nohang(pids[i], wstat) ;
+    if (r == -1) return -1-i ;
+    else if (r == pids[i]) return 1+i ;
+  }
+  return 0 ;
+}