socketpair.c:Replace kmm with fs heap

due to https://github.com/apache/nuttx/pull/13722/commits, In the socketpair.c,fs_heap interface replaces kmm interface Signed-off-by: wangchen <wangchen41@xiaomi.com>
2026-05-26 18:56:10 +08:00 · 2024-09-29 20:19:40 +08:00
parent c59c6b08f3
commit addfe127a9
4 changed files with 141 additions and 98 deletions
@@ -96,99 +96,3 @@ errsock:
  psock_close(psocks[0]);
  return ret;
 }
-
-/****************************************************************************
- * Name: socketpair
- *
- * Description:
- * Create an unbound pair of connected sockets in a specified domain, of a
- * specified type, under the protocol optionally specified by the protocol
- * argument. The two sockets shall be identical. The file descriptors used
- * in referencing the created sockets shall be returned in
- * sv[0] and sv[1].
- *
- * Input Parameters:
- *   domain   - (see sys/socket.h)
- *   type     - (see sys/socket.h)
- *   protocol - (see sys/socket.h)
- *   sv[2]    - The user provided array in which to catch the pair
- *              descriptors
- *
- ****************************************************************************/
-
-int socketpair(int domain, int type, int protocol, int sv[2])
-{
-  FAR struct socket *psocks[2];
-  int oflags = O_RDWR;
-  int ret;
-  int i;
-  int j = 0;
-  int k;
-
-  if (sv == NULL)
-    {
-      ret = -EINVAL;
-      goto errout;
-    }
-
-  for (k = 0; k < 2; k++)
-    {
-      psocks[k] = kmm_zalloc(sizeof(*psocks[k]));
-      if (psocks[k] == NULL)
-        {
-          ret = -ENOMEM;
-          goto errout_with_alloc;
-        }
-    }
-
-  ret = psock_socketpair(domain, type, protocol, psocks);
-  if (ret < 0)
-    {
-      goto errout_with_alloc;
-    }
-
-  if (type & SOCK_CLOEXEC)
-    {
-      oflags |= O_CLOEXEC;
-    }
-
-  if (type & SOCK_NONBLOCK)
-    {
-      oflags |= O_NONBLOCK;
-    }
-
-  /* Allocate a socket descriptor */
-
-  for (; j < 2; j++)
-    {
-      sv[j] = sockfd_allocate(psocks[j], oflags);
-      if (sv[j] < 0)
-        {
-          ret = sv[j];
-          goto errout_with_psock;
-        }
-    }
-
-  return OK;
-
-errout_with_psock:
-  for (i = 0; i < j; i++)
-    {
-      nx_close(sv[i]);
-    }
-
-  for (i = j; i < k; i++)
-    {
-      psock_close(psocks[i]);
-    }
-
-errout_with_alloc:
-  for (i = j; i < k; i++)
-    {
-      kmm_free(psocks[i]);
-    }
-
-errout:
-  set_errno(-ret);
-  return ERROR;
-}