Clean up defines in src/platform/BUILD.gn

src/include/platform/LockTracker.h

@@ -32,7 +32,7 @@
 namespace chip {
 namespace Platform {
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
 
 namespace Internal {
 

src/include/platform/PlatformManager.h

@@ -96,7 +96,7 @@ class PlatformManager
     void UnlockChipStack();
     CHIP_ERROR Shutdown();
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     bool IsChipStackLockedByCurrentThread() const;
 #endif
 
@@ -187,7 +187,7 @@ extern PlatformManagerImpl & PlatformMgrImpl();
 namespace chip {
 namespace DeviceLayer {
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
 inline bool PlatformManager::IsChipStackLockedByCurrentThread() const
 {
     return static_cast<const ImplClass *>(this)->_IsChipStackLockedByCurrentThread();

src/include/platform/internal/GenericPlatformManagerImpl_POSIX.cpp

@@ -83,7 +83,7 @@ void GenericPlatformManagerImpl_POSIX<ImplClass>::_LockChipStack()
     int err = pthread_mutex_lock(&mChipStackLock);
     assert(err == 0);
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     mChipStackIsLocked        = true;
     mChipStackLockOwnerThread = pthread_self();
 #endif
@@ -93,7 +93,7 @@ template <class ImplClass>
 bool GenericPlatformManagerImpl_POSIX<ImplClass>::_TryLockChipStack()
 {
     bool locked = (pthread_mutex_trylock(&mChipStackLock) == 0);
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     if (locked)
     {
         mChipStackIsLocked        = true;
@@ -106,15 +106,15 @@ bool GenericPlatformManagerImpl_POSIX<ImplClass>::_TryLockChipStack()
 template <class ImplClass>
 void GenericPlatformManagerImpl_POSIX<ImplClass>::_UnlockChipStack()
 {
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     mChipStackIsLocked = false;
 #endif
 
     int err = pthread_mutex_unlock(&mChipStackLock);
     assert(err == 0);
 }
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
 template <class ImplClass>
 bool GenericPlatformManagerImpl_POSIX<ImplClass>::_IsChipStackLockedByCurrentThread() const
 {

src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h

@@ -67,7 +67,7 @@ class GenericPlatformManagerImpl_POSIX : public GenericPlatformManagerImpl<ImplC
     pthread_attr_t mChipTaskAttr;
     struct sched_param mChipTaskSchedParam;
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     bool mMainLoopStarted   = false;
     bool mChipStackIsLocked = false;
     pthread_t mChipStackLockOwnerThread;
@@ -86,7 +86,7 @@ class GenericPlatformManagerImpl_POSIX : public GenericPlatformManagerImpl<ImplC
     CHIP_ERROR _StartChipTimer(int64_t durationMS);
     CHIP_ERROR _Shutdown();
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     bool _IsChipStackLockedByCurrentThread() const;
 #endif
 

src/platform/BUILD.gn

@@ -60,57 +60,56 @@ if (chip_device_platform != "none") {
     chip_stack_lock_tracking = "auto"
   }
 
+  if (chip_stack_lock_tracking == "auto") {
+    if (chip_device_platform == "linux" || chip_device_platform == "darwin") {
+      # TODO: should be fatal for development. Change once bugs are fixed
+      chip_stack_lock_tracking = "log"
+    } else {
+      # TODO: may want to enable at least logging for embedded to find bugs
+      # this needs tuning depending on how many resources various platforms have
+      # available (mainly flash size)
+      chip_stack_lock_tracking = "none"
+    }
+  } else {
+    assert(
+        chip_stack_lock_tracking == "none" ||
+            chip_stack_lock_tracking == "log" ||
+            chip_stack_lock_tracking == "fatal",
+        "Please select a valid value for chip_stack_lock_tracking: auto, none, log, fatal")
+  }
+
   buildconfig_header("platform_buildconfig") {
     header = "CHIPDeviceBuildConfig.h"
     header_dir = "platform"
 
     chip_with_gio = chip_enable_wifi
     chip_device_config_enable_wpa = chip_enable_wifi
+    chip_device_config_enable_mdns = chip_mdns != "none"
+    chip_stack_lock_tracking_log = chip_stack_lock_tracking != "none"
+    chip_stack_lock_tracking_fatal = chip_stack_lock_tracking == "fatal"
 
     defines = [
       "CHIP_DEVICE_CONFIG_ENABLE_WPA=${chip_device_config_enable_wpa}",
       "CHIP_ENABLE_OPENTHREAD=${chip_enable_openthread}",
       "CHIP_WITH_GIO=${chip_with_gio}",
       "OPENTHREAD_CONFIG_ENABLE_TOBLE=false",
       "CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING=${chip_use_clusters_for_ip_commissioning}",
+      "CHIP_DEVICE_CONFIG_ENABLE_MDNS=${chip_device_config_enable_mdns}",
+      "CHIP_BYPASS_RENDEZVOUS=${chip_bypass_rendezvous}",
+      "CHIP_STACK_LOCK_TRACKING_ENABLED=${chip_stack_lock_tracking_log}",
+      "CHIP_STACK_LOCK_TRACKING_ERROR_FATAL=${chip_stack_lock_tracking_fatal}",
+      "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING=${chip_enable_additional_data_advertising}",
+      "CHIP_ENABLE_ROTATING_DEVICE_ID=${chip_enable_rotating_device_id}",
     ]
 
     if (chip_device_platform == "linux" || chip_device_platform == "darwin") {
       defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=${chip_enable_ble}" ]
     }
 
-    stack_log_tracking = chip_stack_lock_tracking
-    if (stack_log_tracking == "auto") {
-      if (chip_device_platform == "linux") {
-        # TODO: should be fatal for development. Change once bugs are fixed
-        stack_log_tracking = "log"
-      } else {
-        # TODO: may want to enable at least logging for embedded to find bugs
-        # this needs tuning depending on how many resources various platforms have
-        # available (mainly flash size)
-        stack_log_tracking = "none"
-      }
-    }
-
-    if (stack_log_tracking == "fatal") {
-      defines += [
-        "CHIP_STACK_LOCK_TRACKING_ENABLED=1",
-        "CHIP_STACK_LOCK_TRACKING_ERROR_FATAL=1",
-      ]
-    } else if (stack_log_tracking == "log") {
-      defines += [ "CHIP_STACK_LOCK_TRACKING_ENABLED=1" ]
-    } else {
-      assert(stack_log_tracking == "none")
-    }
-
     if (chip_enable_nfc) {
       defines += [ "CHIP_DEVICE_CONFIG_ENABLE_NFC=1" ]
     }
 
-    if (chip_mdns != "none") {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_MDNS=1" ]
-    }
-
     if (chip_device_project_config_include != "") {
       defines += [ "CHIP_DEVICE_PROJECT_CONFIG_INCLUDE=${chip_device_project_config_include}" ]
     }
@@ -125,22 +124,6 @@ if (chip_device_platform != "none") {
       defines += [ "CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME=\"${chip_device_config_firmware_build_time}\"" ]
     }
 
-    if (chip_bypass_rendezvous) {
-      defines += [ "CHIP_BYPASS_RENDEZVOUS=1" ]
-    }
-
-    if (chip_enable_additional_data_advertising) {
-      defines += [ "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING=1" ]
-    } else {
-      defines += [ "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING=0" ]
-    }
-
-    if (chip_enable_rotating_device_id) {
-      defines += [ "CHIP_ENABLE_ROTATING_DEVICE_ID=1" ]
-    } else {
-      defines += [ "CHIP_ENABLE_ROTATING_DEVICE_ID=0" ]
-    }
-
     if (chip_device_platform == "cc13x2_26x2") {
       defines += [
         "CHIP_DEVICE_LAYER_TARGET_CC13X2_26X2=1",

src/platform/Darwin/PlatformManagerImpl.h

@@ -65,7 +65,7 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     void _UnlockChipStack(){};
     void _PostEvent(const ChipDeviceEvent * event);
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
     bool _IsChipStackLockedByCurrentThread() const { return false; };
 #endif
 

src/platform/LockTracker.cpp

@@ -17,7 +17,7 @@
 
 #include <platform/LockTracker.h>
 
-#if defined(CHIP_STACK_LOCK_TRACKING_ENABLED)
+#if CHIP_STACK_LOCK_TRACKING_ENABLED
 
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/PlatformManager.h>
@@ -32,7 +32,7 @@ void AssertChipStackLockedByCurrentThread(const char * file, int line)
     if (!chip::DeviceLayer::PlatformMgr().IsChipStackLockedByCurrentThread())
     {
         ChipLogError(DeviceLayer, "Chip stack locking error at '%s:%d'. Code is unsafe/racy", file, line);
-#if defined(CHIP_STACK_LOCK_TRACKING_ERROR_FATAL)
+#if CHIP_STACK_LOCK_TRACKING_ERROR_FATAL
         chipDie();
 #endif
     }