Просмотр исходного кода

Revert "update:socket同步接口减少EVENT堆积"

This reverts commit cda79be148e8ffade163d26558a9f1954b072bea.
alienwalker 2 лет назад
Родитель
Сommit
1ab8104bc2

+ 1 - 2
components/network/adapter/luat_lib_socket.c

@@ -830,8 +830,7 @@ static int l_socket_release(lua_State *L)
 @int dns服务器序号,从1开始
 @string or int dns,如果是IPV4,可以是大端格式的int值
 @return boolean 成功返回true,失败返回false
-@usage
-socket.setDNS(socket.ETH0, 1, "114.114.114.114")
+@usage socket.setDNS(socket.ETH0, 1, "114.114.114.114")
 */
 static int l_socket_set_dns(lua_State *L)
 {

+ 1 - 12
components/network/adapter/luat_network_adapter.c

@@ -1013,14 +1013,6 @@ static void network_default_statemachine(network_ctrl_t *ctrl, OS_EVENT *event,
 	NW_UNLOCK;
 	if (ctrl->task_handle)
 	{
-		if (EV_NW_RESULT_EVENT == event->ID)
-		{
-			ctrl->event_cnt++;
-			if (ctrl->event_cnt >= 2)
-			{
-				return;
-			}
-		}
 		platform_send_event(ctrl->task_handle, event->ID, event->Param1, event->Param2, event->Param3);
 	}
 	else if (ctrl->user_callback)
@@ -1978,7 +1970,7 @@ int network_connect(network_ctrl_t *ctrl, const char *domain_name, uint32_t doma
 	{
 		return -1;
 	}
-	ctrl->event_cnt = 0;
+
 	NW_LOCK;
 	ctrl->is_server_mode = 0;
 	ctrl->tx_size = 0;
@@ -2189,7 +2181,6 @@ int network_close(network_ctrl_t *ctrl, uint32_t timeout_ms)
 		return 0;
 	}
 	NW_UNLOCK;
-	ctrl->event_cnt = 0;
 	if (!ctrl->task_handle || !timeout_ms)
 	{
 		return 1;
@@ -2478,7 +2469,6 @@ int network_wait_event(network_ctrl_t *ctrl, OS_EVENT *out_event, uint32_t timeo
 	{
 		return -1;
 	}
-	ctrl->event_cnt = 0;
 	NW_LOCK;
 	ctrl->auto_mode = 1;
 	ctrl->wait_target_state = NW_WAIT_EVENT;
@@ -2556,7 +2546,6 @@ int network_wait_rx(network_ctrl_t *ctrl, uint32_t timeout_ms, uint8_t *is_break
 	{
 		return -1;
 	}
-	ctrl->event_cnt = 0;
 	NW_LOCK;
 	ctrl->auto_mode = 1;
 	ctrl->wait_target_state = NW_WAIT_EVENT;

+ 0 - 1
components/network/adapter/luat_network_adapter.h

@@ -193,7 +193,6 @@ typedef struct
     uint8_t state;
     uint8_t is_debug;
     uint8_t domain_ipv6;
-    uint8_t event_cnt;
 }network_ctrl_t;
 
 typedef struct