[incubator-nuttx-apps] branch master updated: usrsock: delete sock->s_crefs to fix compile break

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e1148c  usrsock: delete sock->s_crefs to fix compile break
0e1148c is described below

commit 0e1148cf1d4bbed84d15cdc4929266989f098050
Author: Jiuzhu Dong <dongjiuz...@xiaomi.com>
AuthorDate: Thu Feb 25 12:14:59 2021 +0800

    usrsock: delete sock->s_crefs to fix compile break
    
    Signed-off-by: Jiuzhu Dong <dongjiuz...@xiaomi.com>
---
 netutils/usrsock_rpmsg/usrsock_rpmsg_server.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c 
b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
index ceb5f36..779db12 100644
--- a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
@@ -207,13 +207,11 @@ static int usrsock_rpmsg_socket_handler(struct 
rpmsg_endpoint *ept,
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
       pthread_mutex_lock(&priv->mutex);
-      if (priv->socks[i].s_crefs == 0)
+      if (priv->socks[i].s_conn == NULL)
         {
-          priv->socks[i].s_crefs++;
-          pthread_mutex_unlock(&priv->mutex);
-
           ret = psock_socket(req->domain, req->type, req->protocol,
                              &priv->socks[i]);
+          pthread_mutex_unlock(&priv->mutex);
           if (ret >= 0)
             {
               psock_fcntl(&priv->socks[i], F_SETFL,
@@ -222,10 +220,6 @@ static int usrsock_rpmsg_socket_handler(struct 
rpmsg_endpoint *ept,
               priv->epts[i] = ept;
               ret = i; /* Return index as the usockid */
             }
-          else
-            {
-              priv->socks[i].s_crefs--;
-            }
 
           break;
         }
@@ -553,14 +547,12 @@ static int usrsock_rpmsg_accept_handler(struct 
rpmsg_endpoint *ept,
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
           pthread_mutex_lock(&priv->mutex);
-          if (priv->socks[i].s_crefs == 0)
+          if (priv->socks[i].s_conn == NULL)
             {
-              priv->socks[i].s_crefs++;
-              pthread_mutex_unlock(&priv->mutex);
-
               ret = psock_accept(&priv->socks[req->usockid],
                       outaddrlen ? (struct sockaddr *)(ack + 1) : NULL,
                       outaddrlen ? &outaddrlen : NULL, &priv->socks[i]);
+              pthread_mutex_unlock(&priv->mutex);
               if (ret >= 0)
                 {
                   psock_fcntl(&priv->socks[i], F_SETFL,
@@ -581,10 +573,6 @@ static int usrsock_rpmsg_accept_handler(struct 
rpmsg_endpoint *ept,
 
                   ret = sizeof(int16_t); /* Return usockid size */
                 }
-              else
-                {
-                  priv->socks[i].s_crefs--;
-                }
 
               break;
             }