Fix race condition in main loop

.github/workflows/cmake-linux.yml

@@ -102,6 +102,8 @@ jobs:
             install_faketime: false
           # thread sanitizer
           - args: -DOC_TSAN_ENABLED=ON
+            # GCC thread-sanitizer keeps reporting false positives, so we use clang instead for tests with thread-sanitizer
+            clang: true
             install_faketime: true
           # undefined behaviour sanitizer
           - args: -DOC_UBSAN_ENABLED=ON

.github/workflows/plgd-device-test-with-cfg.yml

@@ -25,6 +25,11 @@ on:
         type: string
         required: false
         default: P256
+      clang:
+        description: Use clang instead of gcc
+        type: boolean
+        required: false
+        default: false
       coverage:
         type: boolean
         required: false
@@ -42,6 +47,7 @@ env:
   CERT_TOOL_IMAGE: ghcr.io/plgd-dev/hub/cert-tool:vnext
   CERT_PATH: .tmp/pki_certs
   CLOUD_SERVER_DOCKER_FILE: docker/apps/Dockerfile.cloud-server-debug
+  CLOUD_SERVER_CLANG_DOCKER_FILE: docker/apps/Dockerfile.cloud-server-debug-clang
   CLOUD_SERVER_DOCKER_TAG: dbg
 
 jobs:
@@ -60,7 +66,7 @@ jobs:
         with:
           context: .
           push: false
-          file: ${{ env.CLOUD_SERVER_DOCKER_FILE }}
+          file: ${{ (inputs.clang && env.CLOUD_SERVER_CLANG_DOCKER_FILE) || env.CLOUD_SERVER_DOCKER_FILE }}
           tags: ${{ env.CLOUD_SERVER_DOCKER_TAG }}
           build-args: |
             BUILD_ARGS=${{ inputs.build_args }}

.github/workflows/plgd-device-tests.yml

@@ -49,34 +49,40 @@ jobs:
             args: "-DOC_ASAN_ENABLED=ON"
           - name: cloud-server-tsan
             args: "-DOC_TSAN_ENABLED=ON"
+            # GCC thread-sanitizer keeps reporting false positives, so we use clang instead for tests with thread-sanitizer
+            clang: true
 
           - name: cloud-server-access-in-RFOTM
             args: "-DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-asan-access-in-RFOTM
             args: "-DOC_ASAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-tsan-access-in-RFOTM
             args: "-DOC_TSAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-asan
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_ASAN_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-tsan
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-asan-access-in-RFOTM
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_ASAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-tsan-access-in-RFOTM
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_TSAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-rep-realloc
             args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON"
           - name: cloud-server-rep-realloc-asan
             args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_ASAN_ENABLED=ON"
           - name: cloud-server-rep-realloc-tsan
             args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc
             # same configuration as "cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc" in the SonarCloud scan job, skip for events that trigger both jobs
@@ -86,6 +92,7 @@ jobs:
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON-DOC_ASAN_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc-tsan
             args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
     uses: ./.github/workflows/plgd-device-test-with-cfg.yml
     with:
@@ -94,4 +101,5 @@ jobs:
       build_type: Debug
       cert_signature_algorithm: ${{ (github.event_name == 'workflow_dispatch' && inputs.cert_signature_algorithm) || 'ECDSA-SHA256' }}
       cert_elliptic_curve: ${{ (github.event_name == 'workflow_dispatch' && inputs.cert_elliptic_curve) || 'P256' }}
+      clang: ${{ matrix.clang || false }}
       skip: ${{ matrix.skip || false }}

.github/workflows/plgd-hub-test-with-cfg.yml

@@ -30,6 +30,11 @@ on:
         type: string
         required: false
         default: P256
+      clang:
+        description: Use clang instead of gcc
+        type: boolean
+        required: false
+        default: false
       coverage:
         description: gather and upload coverage data
         type: boolean
@@ -58,6 +63,7 @@ on:
 env:
   TEST_CLOUD_SERVER_IMAGE: ghcr.io/plgd-dev/hub/test-cloud-server:latest
   CLOUD_SERVER_DOCKER_FILE: docker/apps/Dockerfile.cloud-server-debug
+  CLOUD_SERVER_CLANG_DOCKER_FILE: docker/apps/Dockerfile.cloud-server-debug-clang
   CLOUD_SERVER_DOCKER_TAG: dbg
 
 jobs:
@@ -78,7 +84,7 @@ jobs:
           build-args: |
             BUILD_ARGS=${{ inputs.build_args }}
             BUILD_TYPE=${{ inputs.build_type }}
-          file: ${{ env.CLOUD_SERVER_DOCKER_FILE }}
+          file: ${{ (inputs.clang && env.CLOUD_SERVER_CLANG_DOCKER_FILE) || env.CLOUD_SERVER_DOCKER_FILE }}
           tags: ${{ env.CLOUD_SERVER_DOCKER_TAG }}
 
       - name: Pull plgd hub tests image

.github/workflows/plgd-hub-tests.yml

@@ -47,6 +47,8 @@ jobs:
             build_args: "-DOC_ASAN_ENABLED=ON"
           - name: cloud-server-tsan
             build_args: "-DOC_TSAN_ENABLED=ON"
+            # GCC thread-sanitizer keeps reporting false positives, so we use clang instead for tests with thread-sanitizer
+            clang: true
 
           - name: cloud-server-simulate-tpm-asan
             build_args: "-DOC_ASAN_ENABLED=ON"
@@ -64,6 +66,7 @@ jobs:
             build_args: "-DOC_TSAN_ENABLED=ON"
             docker_args: '-e FAKETIME="@2000-01-01 11:12:13"'
             args: "--disable-tls-verify-time"
+            clang: true
 
           - name: cloud-server-time-2100-01-01
             build_args: ""
@@ -77,6 +80,7 @@ jobs:
             build_args: "-DOC_TSAN_ENABLED=ON"
             docker_args: '-e FAKETIME="@2100-01-01 11:12:13"'
             args: "--disable-tls-verify-time"
+            clang: true
 
           - name: cloud-server-set-mbedtls-time-2000-01-01
             build_args: ""
@@ -93,13 +97,15 @@ jobs:
             build_args: "-DOC_ASAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-tsan-access-in-RFOTM
             build_args: "-DOC_TSAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-asan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_ASAN_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-tsan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM
             # same configuration as "cloud-server-discovery-resource-observable-access-in-RFOTM" in the SonarCloud scan job, skip for events that trigger both jobs
@@ -109,20 +115,23 @@ jobs:
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_ASAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-tsan-access-in-RFOTM
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_TSAN_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-rep-realloc
             build_args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON"
           - name: cloud-server-rep-realloc-asan
             build_args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_ASAN_ENABLED=ON"
           - name: cloud-server-rep-realloc-tsan
             build_args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc-asan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_ASAN_ENABLED=ON"
           - name: cloud-server-discovery-resource-observable-access-in-RFOTM-rep-realloc-tsan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_RESOURCE_ACCESS_IN_RFOTM_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
 
           # ports
           - name: cloud-server-tcp-disabled
@@ -138,6 +147,7 @@ jobs:
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
           - name: dtls-cloud-server-tsan
             build_args: "-DOC_TSAN_ENABLED=ON"
+            clang: true
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
 
           - name: dtls-cloud-server-discovery-resource-observable
@@ -148,6 +158,7 @@ jobs:
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
           - name: dtls-cloud-server-discovery-resource-observable-tsan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
 
           - name: dtls-cloud-server-rep-realloc
@@ -160,6 +171,7 @@ jobs:
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
           - name: dtls-cloud-server-rep-realloc-tsan
             build_args: "-DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
 
           - name: dtls-cloud-server-discovery-resource-observable-rep-realloc
@@ -170,6 +182,7 @@ jobs:
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
           - name: dtls-cloud-server-discovery-resource-observable-rep-realloc-tsan
             build_args: "-DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON -DOC_REPRESENTATION_REALLOC_ENCODING_ENABLED=ON -DOC_TSAN_ENABLED=ON"
+            clang: true
             hub_args: "-e COAP_GATEWAY_UDP_ENABLED=true"
 
     uses: ./.github/workflows/plgd-hub-test-with-cfg.yml
@@ -182,4 +195,5 @@ jobs:
       docker_args: ${{ matrix.docker_args }}
       cert_signature_algorithm: ${{ (github.event_name == 'workflow_dispatch' && inputs.cert_signature_algorithm) || 'ECDSA-SHA256' }}
       cert_elliptic_curve: ${{ (github.event_name == 'workflow_dispatch' && inputs.cert_elliptic_curve) || 'P256' }}
+      clang: ${{ matrix.clang || false }}
       skip: ${{ matrix.skip || false }}

api/oc_main.c

@@ -411,6 +411,12 @@ oc_main_poll(void)
   return (oc_clock_time_t)((int64_t)(next_event_mt - now_mt) + (int64_t)now);
 }
 
+bool
+oc_main_needs_poll(void)
+{
+  return oc_process_needs_poll();
+}
+
 void
 oc_main_shutdown(void)
 {