From 0445f2a3590f67441602a05fe3924ab677c79ff0 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 14 Jun 2017 04:09:00 +0000
Subject:  Add ftrigr_checksa(), rewrite s6_svlisten_loop() around it

 - Fixes the race condition hit by permanent failure, i.e. two ftrig events close to each other
 - Requires storing the sequence of events client-side, so an additional stralloc, bleh
 - The visible struct ftrigr_s changes, so a major bump is needed -> prepare for 2.6.0.0
 - ftrigr_check() is now a trivial wrapper around ftrigr_checksa()
---
 doc/index.html        |  4 ++--
 doc/libs6/ftrigr.html | 21 +++++++++++++++++++++
 doc/upgrade.html      |  6 ++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index 4030733..636d015 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -83,7 +83,7 @@ with s6</a> </li>
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.5.1.0 or later. It's a build-time requirement. It's also a run-time
+2.5.1.1 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
@@ -100,7 +100,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.5.1.0.tar.gz">2.5.1.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.6.0.0.tar.gz">2.6.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/libs6/ftrigr.html b/doc/libs6/ftrigr.html
index 3a32c7e..cc9e37a 100644
--- a/doc/libs6/ftrigr.html
+++ b/doc/libs6/ftrigr.html
@@ -266,5 +266,26 @@ times that an event happened to this identifier since the last
 call to <tt>ftrigr_check()</tt>. </li>
 </ul>
 
+<pre>
+int ftrigr_checksa (ftrigr_t *a, uint16_t id, stralloc *what)
+</pre>
+
+<p>
+ Checks whether an event happened to <em>id</em>. Use after a
+call to <tt>ftrigr_update()</tt>, as an alternative to <tt>ftrigr_check()</tt>.
+</p>
+
+<ul>
+ <li> If an error occurred, returns -1 and sets errno. The error
+number may have been transmitted from
+<a href="s6-ftrigrd.html">s6-ftrigrd</a>. </li>
+ <li> If no notification happened yet, returns 0. </li>
+ <li> If something happened, appends one character to the end of the <em>what</em>
+<a href="//skarnet.org/software/skalibs/libstddjb/stralloc.html">stralloc</a>
+for every time a notification was triggered since the last call
+to <tt>ftrigr_check()</tt>. Each character is the one that triggered
+a notification. The function then returns 1. </li>
+</ul>
+
 </body>
 </html>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index b9b8461..df5cb3b 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.6.0.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.5.1.1. </li>
+</ul>
+
 <h2> in 2.5.1.0 </h2>
 
 <ul>
-- 
cgit v1.2.3