Merged in hardlulz/modem-3.0-nuttx/fix-sem-EINTR (pull request #603)

Added ECANCELED condition to DEBUGASSERT-s checking sem_wait result

Approved-by: Gregory Nutt <gnutt@nuttx.org>

net/usrsock/usrsock_bind.c

@@ -204,7 +204,7 @@ int usrsock_bind(FAR struct socket *psock,
 
       while ((ret = net_lockedwait(&state.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;

net/usrsock/usrsock_close.c

@@ -175,7 +175,7 @@ int usrsock_close(FAR struct usrsock_conn_s *conn)
 
       while ((ret = net_lockedwait(&state.recvsem)) < OK)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;

net/usrsock/usrsock_conn.c

@@ -95,7 +95,7 @@ static void _usrsock_semtake(FAR sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 }
 

net/usrsock/usrsock_connect.c

@@ -229,7 +229,7 @@ int usrsock_connect(FAR struct socket *psock,
       ret = net_lockedwait(&state.recvsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
 
           /* Wait interrupted, exit early. */
 

net/usrsock/usrsock_dev.c

@@ -1215,7 +1215,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
 
   while ((ret = net_lockedwait(&dev->req.sem)) < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   if (usrsockdev_is_opened(dev))
@@ -1234,7 +1234,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
 
       while ((ret = net_lockedwait(&dev->req.acksem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
     }
   else

net/usrsock/usrsock_getsockname.c

@@ -235,7 +235,7 @@ int usrsock_getsockname(FAR struct socket *psock,
 
       while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.reqstate.result;

net/usrsock/usrsock_getsockopt.c

@@ -246,7 +246,7 @@ int usrsock_getsockopt(FAR struct usrsock_conn_s *conn, int level, int option,
 
       while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.reqstate.result;

net/usrsock/usrsock_recvfrom.c

@@ -444,7 +444,7 @@ ssize_t usrsock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
           while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
             {
-              DEBUGASSERT(ret == -EINTR);
+              DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
             }
 
           ret = state.reqstate.result;

net/usrsock/usrsock_sendto.c

@@ -400,7 +400,7 @@ ssize_t usrsock_sendto(FAR struct socket *psock, FAR const void *buf,
 
           while ((ret = net_lockedwait(&state.recvsem)) < 0)
             {
-              DEBUGASSERT(ret == -EINTR);
+              DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
             }
 
           ret = state.result;

net/usrsock/usrsock_setsockopt.c

@@ -212,7 +212,7 @@ int usrsock_setsockopt(FAR struct usrsock_conn_s *conn, int level, int option,
 
       while ((ret = net_lockedwait(&state.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;

net/usrsock/usrsock_socket.c

@@ -233,7 +233,7 @@ int usrsock_socket(int domain, int type, int protocol, FAR struct socket *psock)
 
   while ((ret = net_lockedwait(&state.recvsem)) < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   if (state.result < 0)