Separate wall clocks from stopwatches

8 files changed, 10 insertions, 0 deletions

diff --git a/src/fdholder/s6-fdholder-delete.c b/src/fdholder/s6-fdholder-delete.c
index 09d3a2c..2a50b79 100644
--- a/src/fdholder/s6-fdholder-delete.c
+++ b/src/fdholder/s6-fdholder-delete.c
@@ -32,6 +32,7 @@ int main (int argc, char const *const *argv)
     else deadline = tain_infinite_relative ;
   }
   if (argc < 2) dieusage() ;
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-getdump.c b/src/fdholder/s6-fdholder-getdump.c
index 89069e9..7b45124 100644
--- a/src/fdholder/s6-fdholder-getdump.c
+++ b/src/fdholder/s6-fdholder-getdump.c
@@ -39,6 +39,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   if (argc < 2) dieusage() ;
 
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-list.c b/src/fdholder/s6-fdholder-list.c
index d6981d0..2be3a25 100644
--- a/src/fdholder/s6-fdholder-list.c
+++ b/src/fdholder/s6-fdholder-list.c
@@ -40,6 +40,7 @@ int main (int argc, char const *const *argv)
   }
 
   if (!argc) dieusage() ;
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-retrieve.c b/src/fdholder/s6-fdholder-retrieve.c
index dacc072..c6ce4ee 100644
--- a/src/fdholder/s6-fdholder-retrieve.c
+++ b/src/fdholder/s6-fdholder-retrieve.c
@@ -37,6 +37,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   if (argc < 3) dieusage() ;
 
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-setdump.c b/src/fdholder/s6-fdholder-setdump.c
index 41a1c07..3265997 100644
--- a/src/fdholder/s6-fdholder-setdump.c
+++ b/src/fdholder/s6-fdholder-setdump.c
@@ -40,6 +40,7 @@ int main (int argc, char const *const *argv)
   x = getenv("S6_FD#") ;
   if (!x) strerr_dienotset(100, "S6_FD#") ;
   if (!uint0_scan(x, &dumplen)) strerr_dieinvalid(100, "S6_FD#") ;
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-store.c b/src/fdholder/s6-fdholder-store.c
index 75510d2..bc221cd 100644
--- a/src/fdholder/s6-fdholder-store.c
+++ b/src/fdholder/s6-fdholder-store.c
@@ -38,6 +38,7 @@ int main (int argc, char const *const *argv)
   }
   if (argc < 2) dieusage() ;
 
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   tain_add_g(&limit, &limit) ;
diff --git a/src/fdholder/s6-fdholder-transferdump.c b/src/fdholder/s6-fdholder-transferdump.c
index 83d1e80..d7730a9 100644
--- a/src/fdholder/s6-fdholder-transferdump.c
+++ b/src/fdholder/s6-fdholder-transferdump.c
@@ -53,6 +53,7 @@ int main (int argc, char const *const *argv)
   }
   if (argc < 2) dieusage() ;
 
+  tain_now_set_stopwatch() ;
   tain_now_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c
index 86a957a..47e1f17 100644
--- a/src/fdholder/s6-fdholderd.c
+++ b/src/fdholder/s6-fdholderd.c
@@ -762,6 +762,9 @@ int main (int argc, char const *const *argv, char const *const *envp)
       fd_write(1, "\n", 1) ;
       fd_close(1) ;
     }
+
+    /* We are long-lived and have to check absolute fd deadlines,
+       so we purposefully remain in wallclock mode. */
     tain_now_g() ;
 
     for (;;)