prepare 2.1.1 release (#21)

Author: LaunchDarklyCI

.circleci/config.yml

@@ -8,6 +8,7 @@ workflows:
   build_and_test_all:
     jobs:
       - build-test-linux
+      - build-test-linux-32bit
       - build-test-osx
       - build-test-windows
 
@@ -32,6 +33,36 @@ jobs:
             cd build
             CTEST_OUTPUT_ON_FAILURE=1 make test
 
+  build-test-linux-32bit:
+    docker:
+      - image: i386/ubuntu:18.04
+      - image: redis
+    environment:
+      CTEST_OUTPUT_ON_FAILURE: 1
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            apt-get update -y
+            apt-get install -y \
+              libcurl4-openssl-dev \
+              libpcre3-dev \
+              libhiredis-dev \
+              build-essential \
+              cmake
+      - run:
+          name: Build
+          command: |
+            mkdir build && cd build
+            cmake -D REDIS_STORE=ON ..
+            cmake --build .
+      - run:
+          name: Test
+          command: |
+            cd build
+            CTEST_OUTPUT_ON_FAILURE=1 make test
+
   build-test-osx:
     macos:
       xcode: "9.0"

src/utility.c

@@ -16,6 +16,7 @@
     #include <windows.h>
 #else
     #include <unistd.h>
+    #include <errno.h>
 #endif
 
 int
@@ -67,10 +68,20 @@ LDi_sleepMilliseconds(const unsigned long milliseconds)
         return true;
     #else
         int status;
+        useconds_t usec;
 
-        if ((status = usleep(1000 * milliseconds)) != 0) {
+        if (milliseconds >= 1000) {
+            usec = 999999;
+
+            LD_LOG(LD_LOG_WARNING,
+                "LDi_sleepMilliseconds capping usleep at 999999");
+        } else {
+            usec = milliseconds * 1000;
+        }
+
+        if ((status = usleep(usec)) != 0) {
             LD_LOG_1(LD_LOG_CRITICAL, "usleep failed with: %s",
-                strerror(status));
+                strerror(errno));
 
             LD_ASSERT(false);
 

src/utility.h

@@ -27,6 +27,7 @@
 
 #define LD_UUID_SIZE 36
 
+/* limited to 1 second */
 bool LDi_sleepMilliseconds(const unsigned long milliseconds);
 bool LDi_getMonotonicMilliseconds(double *const resultMilliseconds);
 bool LDi_getUnixMilliseconds(double *const resultMilliseconds);