Changeset 48092 in vbox for trunk/src/VBox/Devices/Network/lwip-new

Timestamp:

Aug 27, 2013 4:35:28 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88467

Message:

Drop "fini" callback/arg from tcpip_init() to minimize diffs from
upstream. It's redundant as well. Init callback is necessary because
you want to execute it at the very beginning of tcpip_thread() before
any messages are processed, so normal mbox messages are not suitable
for this.

Instead make termination message (already introduced for VBOX) act as
a callback and use it to pass our fini callback. Rename its message
type to more mnemonic TCPIP_MSG_CALLBACK_TERMINATE.

While here, rototill VBoxLwipCore.cpp to use locking properly and get
rid of global storage for LWIPCOREUSERCALLBACK - since we are waiting
for init/fini callback completion, we can use local variables.

I think VBoxLwipCore.cpp is a bit misguided, since I'm pretty sure
that, for example, you cannot shutdown and then re-init lwip in its
current shape, but for now jsut simplify it as far as we can.

Location:

trunk/src/VBox/Devices/Network/lwip-new/src

Files:

• api/tcpip.c (modified) (5 diffs)
• include/lwip/tcpip.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/lwip-new/src/api/tcpip.c

@@ -53 +53 @@
 static tcpip_init_done_fn tcpip_init_done;
 static void *tcpip_init_done_arg;
-
-static tcpip_fini_done_fn tcpip_fini_done;
-static void *tcpip_fini_done_arg;
-
 static sys_mbox_t mbox;
 
@@ -150 +146 @@
       msg->msg.cb.function(msg->msg.cb.ctx);
       break;
-# ifdef VBOX
-    case TCPIP_MSG_TERM:
-      UNLOCK_TCPIP_CORE();
+
+#ifdef VBOX
+    case TCPIP_MSG_CALLBACK_TERMINATE:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK_TERMINATE %p\n", (void *)msg));
+      if (msg->msg.cb.function != NULL) {
+        msg->msg.cb.function(msg->msg.cb.ctx);
+      }
       goto terminate;
-# endif
+#endif
 
     default:
@@ -162 +162 @@
     }
   }
-# ifdef VBOX
+#ifdef VBOX
  terminate:
-  if (tcpip_fini_done != NULL) 
-    tcpip_fini_done(tcpip_fini_done_arg);
+  /* XXX: TODO: lwip cleanup? */
+  UNLOCK_TCPIP_CORE();
 #endif
 }
@@ -471 +471 @@
  */
 void
-#ifdef VBOX
-tcpip_init(tcpip_init_done_fn initfunc, 
-           void *init_arg, 
-           tcpip_fini_done_fn finifunc, 
-           void *fini_arg)
-#else
-tcpip_init(tcpip_init_done_fn initfunc, 
-             void *init_arg)
-#endif
+tcpip_init(tcpip_init_done_fn initfunc, void *arg)
 {
   lwip_init();
 
   tcpip_init_done = initfunc;
-  tcpip_init_done_arg = init_arg;
-#ifdef VBOX
-  tcpip_fini_done = finifunc;
-  tcpip_fini_done_arg = fini_arg;
-#endif
+  tcpip_init_done_arg = arg;
   if(sys_mbox_new(&mbox, TCPIP_MBOX_SIZE) != ERR_OK) {
     LWIP_ASSERT("failed to create tcpip_thread mbox", 0);
@@ -539 +527 @@
 }
 
-# ifdef VBOX
-void
-tcpip_terminate(void)
-{
-  static struct tcpip_msg msg;
-  msg.type = TCPIP_MSG_TERM;
-  sys_mbox_post(&mbox, &msg);
-}
-# endif
 #endif /* !NO_SYS */

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/tcpip.h

@@ -92 +92 @@
 /** Function prototype for functions passed to tcpip_callback() */
 typedef void (*tcpip_callback_fn)(void *ctx);
-# ifdef VBOX
-/** Function prototype for the fini_done function passed to tcpip_fini */
-typedef void (*tcpip_fini_done_fn)(void *arg);
-# endif
+
 /* Forward declarations */
 struct tcpip_callback_msg;
 
-# ifdef VBOX
-/* The way vbox inform TCPIP thread to finalize ones activity. */
-void tcpip_terminate(void);
-void tcpip_init(tcpip_init_done_fn tcpip_init_done, void *init_arg, tcpip_fini_done_fn tcpip_fini_done, void *fini_arg);
-# else
 void tcpip_init(tcpip_init_done_fn tcpip_init_done, void *arg);
-# endif
 
 #if LWIP_NETCONN
@@ -154 +145 @@
   TCPIP_MSG_CALLBACK_STATIC
 #ifdef VBOX
-  ,
-  TCPIP_MSG_TERM /* VBOX termination message */
+  /* like CALLBACK_STATIC, but then makes tcpip_thread() return */
+  , TCPIP_MSG_CALLBACK_TERMINATE
 #endif
-
 };