X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Falarm.cc;h=6193fbb3cd094065a089c9a21cc84a1c67ae0127;hb=f00605dce4a482c8b19ef17c0e79c31238498522;hp=2d662622c4bae6bf8607a26b9852ad3db4c4df8e;hpb=ad5cb8f903869065c72bb18bf98af6909189a5a9;p=awesomized%2Flibmemcached

diff --git a/libtest/alarm.cc b/libtest/alarm.cc
index 2d662622..6193fbb3 100644
--- a/libtest/alarm.cc
+++ b/libtest/alarm.cc
@@ -34,7 +34,8 @@
  *
  */
 
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
+
 #include <libtest/common.h>
 
 #include <sys/time.h>
@@ -59,7 +60,23 @@ void set_alarm()
 
 void set_alarm(long tv_sec, long tv_usec)
 {
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+  // For the moment use any value to YATL_ALARM to cancel alarming.
+  if (getenv("YATL_ALARM"))
+  {
+    errno= 0;
+    tv_sec= strtol(getenv("YATL_ALARM"), (char **) NULL, 10);
+
+    if (errno != 0)
+    {
+      FATAL("Bad value for YATL_ALARM");
+    }
+    else if (tv_sec == 0)
+    {
+      cancel_alarm();
+    }
+  }
+
+#ifdef __APPLE__
   struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
 #else
   struct timeval it_value= { tv_sec, tv_usec };