sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/usrsock: Change xid from uint64_t to uint32_t

Browse Source 
by generating the new xid for each transaction

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-08-22 05:10:47 +08:00 committed by Alan Carvalho de Assis
parent 62977ec4e8
commit 0334819742
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sim/src/sim/up_usrsock.c
View File

@ -91,7 +91,7 @@ static int usrsock_send(struct usrsock_s *usrsock,
} }
static int usrsock_send_ack(struct usrsock_s *usrsock, static int usrsock_send_ack(struct usrsock_s *usrsock,
uint64_t xid, int32_t result) uint32_t xid, int32_t result)
{ {
struct usrsock_message_req_ack_s ack; struct usrsock_message_req_ack_s ack;
@ -106,7 +106,7 @@ static int usrsock_send_ack(struct usrsock_s *usrsock,
static int usrsock_send_dack(struct usrsock_s *usrsock, static int usrsock_send_dack(struct usrsock_s *usrsock,
struct usrsock_message_datareq_ack_s *ack, struct usrsock_message_datareq_ack_s *ack,
uint64_t xid, int32_t result, uint32_t xid, int32_t result,
uint16_t valuelen, uint16_t valuelen,
uint16_t valuelen_nontrunc) uint16_t valuelen_nontrunc)
{ {

4
include/nuttx/net/usrsock.h
View File

@ -96,7 +96,7 @@ enum usrsock_message_types_e
begin_packed_struct struct usrsock_request_common_s begin_packed_struct struct usrsock_request_common_s
{ {
uint64_t xid; uint32_t xid;
int8_t reqid; int8_t reqid;
int8_t reserved; int8_t reserved;
} end_packed_struct; } end_packed_struct;
@ -230,7 +230,7 @@ begin_packed_struct struct usrsock_message_req_ack_s
struct usrsock_message_common_s head; struct usrsock_message_common_s head;
int32_t result; int32_t result;
uint64_t xid; uint32_t xid;
} end_packed_struct; } end_packed_struct;
/* Request acknowledgment/completion message */ /* Request acknowledgment/completion message */

2
net/usrsock/usrsock.h
View File

@ -98,7 +98,7 @@ struct usrsock_conn_s
struct struct
{ {
sem_t sem; /* Request semaphore (only one outstanding request) */ sem_t sem; /* Request semaphore (only one outstanding request) */
uint64_t xid; /* Expected message exchange id */ uint32_t xid; /* Expected message exchange id */
bool inprogress; /* Request was received but daemon is still processing */ bool inprogress; /* Request was received but daemon is still processing */
uint16_t valuelen; /* Length of value from daemon */ uint16_t valuelen; /* Length of value from daemon */
uint16_t valuelen_nontrunc; /* Actual length of value at daemon */ uint16_t valuelen_nontrunc; /* Actual length of value at daemon */

12
net/usrsock/usrsock_dev.c
View File

@ -63,6 +63,7 @@ struct usrsockdev_s
{ {
sem_t devsem; /* Lock for device node */ sem_t devsem; /* Lock for device node */
uint8_t ocount; /* The number of times the device has been opened */ uint8_t ocount; /* The number of times the device has been opened */
uint32_t newxid; /* New transcation Id */
struct struct
{ {
@ -710,7 +711,7 @@ static ssize_t usrsockdev_handle_req_response(FAR struct usrsockdev_s *dev,
break; break;
default: default:
nwarn("unknown message type: %d, flags: %d, xid: %" PRIu64 ", " nwarn("unknown message type: %d, flags: %d, xid: %" PRIu32 ", "
"result: %" PRId32 "\n", "result: %" PRId32 "\n",
hdr->head.msgid, hdr->head.flags, hdr->xid, hdr->result); hdr->head.msgid, hdr->head.flags, hdr->xid, hdr->result);
return -EINVAL; return -EINVAL;
@ -734,7 +735,7 @@ static ssize_t usrsockdev_handle_req_response(FAR struct usrsockdev_s *dev,
/* No connection waiting for this message. */ /* No connection waiting for this message. */
nwarn("Could find connection waiting for response" nwarn("Could find connection waiting for response"
"with xid=%" PRIu64 "\n", hdr->xid); "with xid=%" PRIu32 "\n", hdr->xid);
ret = -EINVAL; ret = -EINVAL;
goto unlock_out; goto unlock_out;
@ -1146,7 +1147,12 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
/* Get exchange id. */ /* Get exchange id. */
req_head->xid = (uintptr_t)conn; if (++dev->newxid == 0)
{
++dev->newxid;
}
req_head->xid = dev->newxid;
/* Prepare connection for response. */ /* Prepare connection for response. */