Skip to content

Commit

Permalink
Stop using com.zigbee.chip in Darwin queue names. (#19628)
Browse files Browse the repository at this point in the history
Use com.csa.matter instead.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Nov 20, 2023
1 parent f0481e9 commit 2144713
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ - (void)viewDidLoad
[super viewDidLoad];
[self setupUI];

dispatch_queue_t callbackQueue = dispatch_queue_create("com.zigbee.chip.qrcodevc.callback", DISPATCH_QUEUE_SERIAL);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.csa.matter.qrcodevc.callback", DISPATCH_QUEUE_SERIAL);
self.chipController = InitializeCHIP();
[self.chipController setPairingDelegate:self queue:callbackQueue];

Expand Down Expand Up @@ -776,7 +776,7 @@ - (NSString *)getNetworkName:(NSNumber *)discriminator
- (void)_restartMatterStack
{
self.chipController = CHIPRestartController(self.chipController);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.zigbee.chip.qrcodevc.callback", DISPATCH_QUEUE_SERIAL);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.csa.matter.qrcodevc.callback", DISPATCH_QUEUE_SERIAL);
[self.chipController setPairingDelegate:self queue:callbackQueue];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

CHIPPersistentStorageDelegateBridge::CHIPPersistentStorageDelegateBridge(id<CHIPPersistentStorageDelegate> delegate)
: mDelegate(delegate)
, mWorkQueue(dispatch_queue_create("com.zigbee.chip.framework.storage.workqueue", DISPATCH_QUEUE_SERIAL))
, mWorkQueue(dispatch_queue_create("com.csa.matter.framework.storage.workqueue", DISPATCH_QUEUE_SERIAL))
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/Logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char
char formattedMsg[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
int32_t prefixLen = snprintf(formattedMsg, sizeof(formattedMsg), "[%ld] [%lld:%lld] CHIP: [%s] ", ms, (long long) getpid(),
(long long) ktid, module);
static os_log_t log = os_log_create("com.zigbee.chip", "all");
static os_log_t log = os_log_create("com.csa.matter", "all");
if (prefixLen < 0)
{
// This should not happen
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/PlatformManagerImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <dispatch/dispatch.h>
#include <platform/internal/GenericPlatformManagerImpl.h>

static constexpr const char * const CHIP_CONTROLLER_QUEUE = "com.zigbee.chip.framework.controller.workqueue";
static constexpr const char * const CHIP_CONTROLLER_QUEUE = "com.csa.matter.framework.controller.workqueue";

namespace chip {
namespace DeviceLayer {
Expand Down

0 comments on commit 2144713

Please sign in to comment.