From 0a5a2aadb7789251a2cba285e0a680951c5db573 Mon Sep 17 00:00:00 2001
From: Swarup Nayak <swarupnpvt@gmail.com>
Date: Tue, 4 Sep 2018 17:26:26 +0530
Subject: Feat: Fork support

Change-Id: Iae75c1c0bd4961ee052428bdd661d6f1da1bdbcb
Signed-off-by: Swarup Nayak <swarupnpvt@gmail.com>
---
 stacks/lwip_stack/lwip_src/api/spl_api_msg.c       |  9 +++--
 .../lwip_stack/lwip_src/common/stackx_spl_share.h  | 12 ++++++
 stacks/lwip_stack/lwip_src/core/spl_timers.c       |  1 -
 .../lwip_stack/lwip_src/socket/stackx_prot_com.c   | 28 ++++++++++++++
 .../lwip_stack/lwip_src/socket/stackx_prot_com.h   |  3 ++
 .../lwip_src/socket/stackx_protocol_api.c          | 19 ++++++++++
 stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.c | 33 +++++++++++++++++
 stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.h |  1 +
 stacks/lwip_stack/lwip_src/socket/stackx_tcp.c     |  2 +
 stacks/lwip_stack/lwip_src/socket/stackx_udp.c     |  2 +
 stacks/lwip_stack/src/sbr/sbr_protocol_api.h       |  4 +-
 stacks/lwip_stack/src/sbr/sbr_res_mgr.h            | 31 ++++++++++++++++
 stacks/lwip_stack/src/sbr/sbr_socket.c             | 43 ++++++++++++++++++++++
 13 files changed, 183 insertions(+), 5 deletions(-)

(limited to 'stacks/lwip_stack')

diff --git a/stacks/lwip_stack/lwip_src/api/spl_api_msg.c b/stacks/lwip_stack/lwip_src/api/spl_api_msg.c
index 9ba1e92..0986ed4 100644
--- a/stacks/lwip_stack/lwip_src/api/spl_api_msg.c
+++ b/stacks/lwip_stack/lwip_src/api/spl_api_msg.c
@@ -3186,9 +3186,12 @@ update_tcp_state (spl_netconn_t * conn, enum tcp_state state)
           spl_state = SPL_CLOSED;
           break;
         }
-      conn->tcp_state = spl_state;
-      NSTCP_LOGINF ("conn=%p,private_data=%p,state=%d", conn,
-                    conn->private_data, spl_state);
+      if (conn->tcp_state != spl_state)
+        {
+          conn->tcp_state = spl_state;
+          NSTCP_LOGINF ("conn=%p,private_data=%p,state=%d", conn,
+                        conn->private_data, spl_state);
+        }
     }
 }
 
diff --git a/stacks/lwip_stack/lwip_src/common/stackx_spl_share.h b/stacks/lwip_stack/lwip_src/common/stackx_spl_share.h
index 3b0c9f9..2d35dd0 100644
--- a/stacks/lwip_stack/lwip_src/common/stackx_spl_share.h
+++ b/stacks/lwip_stack/lwip_src/common/stackx_spl_share.h
@@ -430,12 +430,24 @@ ss_set_is_listen_conn (spl_netconn_t * sh, i8 is_listen_conn)
   sh->recycle.is_listen_conn = is_listen_conn;
 }
 
+static inline i32
+ss_inc_fork_ref (spl_netconn_t * sh)
+{
+  return __sync_add_and_fetch (&sh->recycle.fork_ref, 1);
+}
+
 static inline i32
 ss_dec_fork_ref (spl_netconn_t * sh)
 {
   return __sync_sub_and_fetch (&sh->recycle.fork_ref, 1);
 }
 
+static inline i32
+ss_get_fork_ref (spl_netconn_t * sh)
+{
+  return sh->recycle.fork_ref;
+}
+
 static inline int
 ss_add_pid (spl_netconn_t * sh, pid_t pid)
 {
diff --git a/stacks/lwip_stack/lwip_src/core/spl_timers.c b/stacks/lwip_stack/lwip_src/core/spl_timers.c
index 50582fc..cfa130b 100644
--- a/stacks/lwip_stack/lwip_src/core/spl_timers.c
+++ b/stacks/lwip_stack/lwip_src/core/spl_timers.c
@@ -283,7 +283,6 @@ deal_timeout_sig (void)
   int retval;
   if (ptimer.first == NULL)
     {
-      NSPOL_LOGERR ("ptimer.first=NULL!!");
       return;
     }
   tmo = rb_entry (ptimer.first, struct ptimer_node, node);
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.c b/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.c
index 6af2a77..292c17a 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.c
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.c
@@ -522,6 +522,34 @@ sbr_com_lock_common (sbr_socket_t * sk)
 
 }
 
+void
+sbr_com_fork_parent (sbr_socket_t * sk, pid_t p)
+{
+  i32 ref = ss_inc_fork_ref (sbr_get_conn (sk));
+  NSSBR_LOGINF ("inc fork ref] fd=%d, p=%d, ref=%d, conn=%p, private_data=%p",
+                sk->fd, p, ref, sbr_get_conn (sk),
+                sbr_get_conn (sk)->private_data);
+}
+
+void
+sbr_com_fork_child (sbr_socket_t * sk, pid_t p, pid_t c)
+{
+  if (ss_add_pid (sbr_get_conn (sk), c) != 0)
+    {
+      NSSBR_LOGERR
+        ("add pid failed] fd=%d, p=%d, c=%d, ref=%d, conn=%p, private_data=%p",
+         sk->fd, p, c, ss_get_fork_ref (sbr_get_conn (sk)), sbr_get_conn (sk),
+         sbr_get_conn (sk)->private_data);
+    }
+  else
+    {
+      NSSBR_LOGINF
+        ("add pid ok] fd=%d, p=%d, c=%d, ref=%d, conn=%p, private_data=%p",
+         sk->fd, p, c, ss_get_fork_ref (sbr_get_conn (sk)), sbr_get_conn (sk),
+         sbr_get_conn (sk)->private_data);
+    }
+}
+
 /*****************************************************************************
 *   Prototype    : sbr_com_unlock_common
 *   Description  : unlock common
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.h b/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.h
index 054393b..1be44cb 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.h
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_prot_com.h
@@ -150,6 +150,9 @@ int sbr_get_sockaddr_and_len (u16 port, spl_ip_addr_t * ip_addr,
                               struct sockaddr *addr, socklen_t * addrlen);
 void sbr_com_set_app_info (sbr_socket_t * sk, void *appinfo);
 
+void sbr_com_fork_parent (sbr_socket_t * sk, pid_t p);
+void sbr_com_fork_child (sbr_socket_t * sk, pid_t p, pid_t c);
+
 #ifdef __cplusplus
 /* *INDENT-OFF* */
 }
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_protocol_api.c b/stacks/lwip_stack/lwip_src/socket/stackx_protocol_api.c
index 94ef483..920d73d 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_protocol_api.c
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_protocol_api.c
@@ -43,6 +43,25 @@ sbr_init_protocol ()
   return sbr_init_stackx ();
 }
 
+/*****************************************************************************
+*   Prototype    : sbr_fork_protocol
+*   Description  : init protocol
+*   Input        : None
+*   Output       : None
+*   Return Value : int
+*   Calls        :
+*   Called By    :
+*
+*****************************************************************************/
+int
+sbr_fork_protocol ()
+{
+  pid_t pid = updata_sys_pid ();
+
+  NSSBR_LOGINF ("update pid in child]pid=%d", pid);
+  return sbr_fork_stackx ();
+}
+
 /*****************************************************************************
 *   Prototype    : sbr_get_fdopt
 *   Description  : get fdopt by domain type protocol
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.c b/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.c
index 331eee1..f3cb5b5 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.c
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.c
@@ -171,6 +171,39 @@ sbr_init_stackx ()
   return 0;
 }
 
+/*****************************************************************************
+*   Prototype    : sbr_fork_stackx
+*   Description  : init stackx res
+*   Input        : None
+*   Output       : None
+*   Return Value : int
+*   Calls        :
+*   Called By    :
+*
+*****************************************************************************/
+int
+sbr_fork_stackx ()
+{
+
+  if (sbr_attach_group_array () != 0)
+    {
+      NSSBR_LOGERR ("sbr_attach_group_array failed");
+      return -1;
+    }
+
+  NSSBR_LOGDBG ("sbr_attach_group_array ok");
+
+  if (sbr_init_tx_pool () != 0)
+    {
+      NSSBR_LOGERR ("init tx pool failed");
+      return -1;
+    }
+
+  NSSBR_LOGDBG ("init tx pool ok");
+  NSSBR_LOGDBG ("sbr_fork_stackx ok");
+  return 0;
+}
+
 /*****************************************************************************
 *   Prototype    : sbr_malloc_conn_for_sk
 *   Description  : malloc netconn for sk,need add pid
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.h b/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.h
index e139644..73cec7f 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.h
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_res_mgr.h
@@ -56,6 +56,7 @@ sbr_get_spl_msg_box (sbr_socket_t * sk, u8 tos)
 }
 
 int sbr_init_stackx ();
+int sbr_fork_stackx ();
 int sbr_malloc_conn_for_sk (sbr_socket_t * sk, spl_netconn_type_t type);
 int sbr_init_conn_for_accept (sbr_socket_t * sk, spl_netconn_t * conn);
 void sbr_free_conn_from_sk (sbr_socket_t * sk);
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_tcp.c b/stacks/lwip_stack/lwip_src/socket/stackx_tcp.c
index c64dc7b..3225c2f 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_tcp.c
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_tcp.c
@@ -1690,6 +1690,8 @@ sbr_fdopt tcp_fdopt = {
   .peak = sbr_com_peak,
   .lock_common = sbr_com_lock_common,
   .unlock_common = sbr_com_unlock_common,
+  .fork_parent = sbr_com_fork_parent,
+  .fork_child = sbr_com_fork_child,
   .ep_getevt = stackx_eventpoll_getEvt,
   .ep_ctl = stackx_eventpoll_triggle,
   .set_close_stat = NULL,
diff --git a/stacks/lwip_stack/lwip_src/socket/stackx_udp.c b/stacks/lwip_stack/lwip_src/socket/stackx_udp.c
index cf08731..69b822b 100644
--- a/stacks/lwip_stack/lwip_src/socket/stackx_udp.c
+++ b/stacks/lwip_stack/lwip_src/socket/stackx_udp.c
@@ -1163,6 +1163,8 @@ sbr_fdopt udp_fdopt = {
   .peak = sbr_com_peak,
   .lock_common = sbr_com_lock_common,
   .unlock_common = sbr_com_unlock_common,
+  .fork_parent = sbr_com_fork_parent,
+  .fork_child = sbr_com_fork_child,
   .ep_getevt = stackx_eventpoll_getEvt,
   .ep_ctl = stackx_eventpoll_triggle,
   .set_close_stat = NULL,
diff --git a/stacks/lwip_stack/src/sbr/sbr_protocol_api.h b/stacks/lwip_stack/src/sbr/sbr_protocol_api.h
index 1c0fb1e..0eac1c4 100644
--- a/stacks/lwip_stack/src/sbr/sbr_protocol_api.h
+++ b/stacks/lwip_stack/src/sbr/sbr_protocol_api.h
@@ -70,6 +70,8 @@ typedef struct
   int (*peak) (sbr_socket_t *);
   void (*lock_common) (sbr_socket_t *);
   void (*unlock_common) (sbr_socket_t *);
+  void (*fork_parent) (sbr_socket_t *, pid_t);
+  void (*fork_child) (sbr_socket_t *, pid_t, pid_t);
   unsigned int (*ep_ctl) (sbr_socket_t *, int triggle_ops,
                           struct epoll_event * event, void *pdata);
   unsigned int (*ep_getevt) (sbr_socket_t *, unsigned int events);
@@ -86,7 +88,7 @@ struct sbr_socket_s
 };
 
 int sbr_init_protocol ();
-
+int sbr_fork_protocol ();
 sbr_fdopt *sbr_get_fdopt (int domain, int type, int protocol);
 void sbr_app_touch_in (void);   /*app send its version info to nStackMain */
 
diff --git a/stacks/lwip_stack/src/sbr/sbr_res_mgr.h b/stacks/lwip_stack/src/sbr/sbr_res_mgr.h
index 54729d4..e731314 100644
--- a/stacks/lwip_stack/src/sbr/sbr_res_mgr.h
+++ b/stacks/lwip_stack/src/sbr/sbr_res_mgr.h
@@ -117,6 +117,37 @@ sbr_lookup_sk (int fd)
   return sk;
 }
 
+/*****************************************************************************
+*   Prototype    : sbr_free_sk
+*   Description  : free sock
+*   Input        : sbr_socket_t * sk
+*   Output       : None
+*   Return Value : static inline void
+*   Calls        :
+*   Called By    :
+*
+*****************************************************************************/
+static inline void
+sbr_free_fd (int fd)
+{
+  if ((fd < 1) || (fd > SBR_MAX_FD_NUM))
+    {
+      NSSBR_LOGERR ("fd is not ok]fd=%d", fd);
+      sbr_set_errno (EBADF);
+      return;
+    }
+
+  sbr_socket_t *sk = &g_res_group.sk[fd];
+  if (!sk->fdopt && !sk->sk_obj && !sk->stack_obj)
+    {
+      NSSBR_LOGERR
+        ("can't free empty fd] fd=%d, fdopt=%p, sk_obj=%p, stack_obj=%p", fd,
+         sk->fdopt, sk->sk_obj, sk->stack_obj);
+      return;
+    }
+  sbr_free_sk (sk);
+}
+
 int sbr_init_res ();
 
 #ifdef __cplusplus
diff --git a/stacks/lwip_stack/src/sbr/sbr_socket.c b/stacks/lwip_stack/src/sbr/sbr_socket.c
index 47aefda..e088224 100644
--- a/stacks/lwip_stack/src/sbr/sbr_socket.c
+++ b/stacks/lwip_stack/src/sbr/sbr_socket.c
@@ -1197,6 +1197,45 @@ SBR_INTERCEPT (int, fd_alloc, ())
   return sbr_socket (AF_INET, SOCK_STREAM, 0);
 }
 
+SBR_INTERCEPT (int, fork_init_child, (pid_t p, pid_t c))
+{
+  NSSBR_LOGDBG ("fork_init_child() is called]");
+  return sbr_fork_protocol ();
+}
+
+SBR_INTERCEPT (void, fork_parent_fd, (int s, pid_t p))
+{
+  NSSBR_LOGDBG ("fork_parent_fd() is called]");
+  sbr_socket_t *sk = sbr_lookup_sk (s);
+
+  if (!sk)
+    {
+      return;
+    }
+
+  sk->fdopt->fork_parent (sk, p);
+}
+
+SBR_INTERCEPT (void, fork_child_fd, (int s, pid_t p, pid_t c))
+{
+  NSSBR_LOGDBG ("fork_child_fd() is called]");
+  sbr_socket_t *sk = sbr_lookup_sk (s);
+
+  if (!sk)
+    {
+      return;
+    }
+
+  sk->fdopt->fork_child (sk, p, c);
+
+}
+
+SBR_INTERCEPT (void, fork_free_fd, (int s, pid_t p, pid_t c))
+{
+  NSSBR_LOGDBG ("fork_free_fd() is called]");
+  sbr_free_fd (s);
+}
+
 /*****************************************************************************
 *   Prototype    : nstack_stack_register
 *   Description  : reg api to nsocket
@@ -1227,5 +1266,9 @@ nstack_stack_register (nstack_proc_cb * ops, nstack_event_cb * val)
   (ops->extern_ops).ep_ctl = GET_SBR_INTERCEPT (ep_ctl);
   (ops->extern_ops).peak = GET_SBR_INTERCEPT (peak);
   (ops->extern_ops).stack_alloc_fd = GET_SBR_INTERCEPT (fd_alloc);      /*alloc a fd id for epoll */
+  (ops->extern_ops).fork_init_child = GET_SBR_INTERCEPT (fork_init_child);
+  (ops->extern_ops).fork_parent_fd = GET_SBR_INTERCEPT (fork_parent_fd);
+  (ops->extern_ops).fork_child_fd = GET_SBR_INTERCEPT (fork_child_fd);
+  (ops->extern_ops).fork_free_fd = GET_SBR_INTERCEPT (fork_free_fd);
   return 0;
 }
-- 
cgit 1.2.3-korg