refactor: 细节优化

mqttclient/include/RyanMqttClient.h

@@ -101,7 +101,7 @@ typedef struct
 	uint16_t sendTimeout;       // mqtt发送命令超时时间, 根据实际硬件选择。单位ms
 	uint16_t ackTimeout;        // mqtt ack 等待回复的超时时间, 典型值为5 - 60秒。单位ms
 	uint16_t keepaliveTimeoutS; // mqtt心跳时间间隔。单位S
-	uint16_t reconnectTimeout;  // mqtt重连间隔时间。单位S
+	uint16_t reconnectTimeout;  // mqtt重连间隔时间。单位ms
 
 	RyanMqttEventHandle mqttEventHandle; // mqtt事件回调函数
 	void *userData;                      // 用户自定义数据,用户需要保证指针指向内容的持久性

test/RyanMqttMemoryFaultToleranceTest.c

@@ -31,7 +31,8 @@ static RyanMqttError_e RyanMqttNetworkFaultPublishHybridTest(int32_t count, uint
 	{
 		if (RyanMqttConnectState != RyanMqttGetState(client))
 		{
-			RyanMqttLog_e("mqtt 发布测试，销毁mqtt客户端aaaaaaaaaaaaa %d", i);
+			RyanMqttLog_e("mqtt 发布测试，销毁mqtt客户端 %d", i);
+			result = RyanMqttFailedError;
 			goto __exit;
 		}
 

test/RyanMqttNetworkFaultQosResilienceTest.c

@@ -139,6 +139,7 @@ static RyanMqttError_e RyanMqttNetworkFaultQosResiliencePublishTest(int32_t coun
 		if (RyanMqttConnectState != RyanMqttGetState(client))
 		{
 			RyanMqttLog_e("mqtt 发布测试，销毁mqtt客户端 %d", i);
+			result = RyanMqttFailedError;
 			goto __exit;
 		}
 
@@ -189,9 +190,7 @@ static RyanMqttError_e RyanMqttNetworkFaultQosResiliencePublishTest(int32_t coun
 		}
 		else if (RyanMqttQos1 == qos)
 		{
-			if (pubTestPublishedEventCount >= sendNeedAckCount
-			    // 不要求接收数据也全部到达，跟emqx服务器关系太大了
-			    && pubTestDataEventCount >= sendNeedAckCount)
+			if (pubTestPublishedEventCount >= sendNeedAckCount && pubTestDataEventCount >= sendNeedAckCount)
 			{
 				break;
 			}

test/RyanMqttNetworkFaultToleranceMemoryTest copy.c → test/RyanMqttNetworkFaultToleranceMemoryTest.c

@@ -31,7 +31,8 @@ static RyanMqttError_e RyanMqttNetworkFaultPublishHybridTest(int32_t count, uint
 	{
 		if (RyanMqttConnectState != RyanMqttGetState(client))
 		{
-			RyanMqttLog_e("mqtt 发布测试，销毁mqtt客户端aaaaaaaaaaaaa %d", i);
+			RyanMqttLog_e("mqtt 发布测试，销毁mqtt客户端 %d", i);
+			result = RyanMqttFailedError;
 			goto __exit;
 		}
 

test/RyanMqttPubTest.c

@@ -135,11 +135,9 @@ static RyanMqttError_e RyanMqttPublishTest(RyanMqttQos_e qos, int32_t count, uin
 	{
 		char *pubTopic = RyanMqttPubTestPubTopic;
 		uint32_t randNumber = RyanRand(1, 10);
-		result = RyanMqttPublishWithUserData(client, pubTopic, RyanMqttStrlen(pubTopic),
-						     (0 == i % randNumber) ? pubStr2 : pubStr,
-						     (0 == i % randNumber) ? pubStr2Len : pubStrLen, qos, RyanMqttFalse,
-						     // NOLINTNEXTLINE(performance-no-int-to-ptr)
-						     (void *)qos);
+		result = RyanMqttPublishWithUserData(
+			client, pubTopic, RyanMqttStrlen(pubTopic), (0 == i % randNumber) ? pubStr2 : pubStr,
+			(0 == i % randNumber) ? pubStr2Len : pubStrLen, qos, RyanMqttFalse, (void *)(uintptr_t)qos);
 		RyanMqttCheckCodeNoReturn(RyanMqttSuccessError == result, RyanMqttFailedError, RyanMqttLog_e,
 					  { goto __exit; });
 

test/RyanMqttTest.c

@@ -281,7 +281,7 @@ static void RyanMqttTestScheduleFreeAfterMs(void *ptr, uint32_t delayMs)
 	sev.sigev_value.sival_ptr = fta;                           // 传递给回调的参数
 	sev.sigev_notify_function = RyanMqttTestFreeTimerCallback; // 定时到期时调用的函数
 
-	if (0 != timer_create(CLOCK_REALTIME, &sev, &timerid))
+	if (0 != timer_create(CLOCK_MONOTONIC, &sev, &timerid))
 	{
 		RyanMqttLog_e("timer_create failed");
 		free(fta);