Changeset 85121 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 8, 2020 7:33:26 PM (4 years ago)

Author:

vboxsync

Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:

trunk/src/VBox/Devices/Network

Files:

• DevINIP.cpp (modified) (1 diff)
• DrvNAT.cpp (modified) (3 diffs)
• lwip-new/vbox/VBoxLwipCore.cpp (modified) (4 diffs)
• lwip-new/vbox/VBoxLwipCore.h (modified) (1 diff)
• testcase/tstIntNetR0.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -245 +245 @@
  * @param   netif   Interface to configure.
  */
-static err_t devINIPInterface(struct netif *netif)
+static err_t devINIPInterface(struct netif *netif) RT_NOTHROW_DEF
 {
     LogFlow(("%s: netif=%p\n", __FUNCTION__, netif));

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -412 +412 @@
  * @thread  NAT
  */
-static void drvNATSendWorker(PDRVNAT pThis, PPDMSCATTERGATHER pSgBuf)
+static DECLCALLBACK(void) drvNATSendWorker(PDRVNAT pThis, PPDMSCATTERGATHER pSgBuf)
 {
 #if 0 /* Assertion happens often to me after resuming a VM -- no time to investigate this now. */
@@ -656 +656 @@
  * @thread "NAT" thread.
  */
-static void drvNATNotifyLinkChangedWorker(PDRVNAT pThis, PDMNETWORKLINKSTATE enmLinkState)
+static DECLCALLBACK(void) drvNATNotifyLinkChangedWorker(PDRVNAT pThis, PDMNETWORKLINKSTATE enmLinkState)
 {
     pThis->enmLinkState = pThis->enmLinkStateWant = enmLinkState;
@@ -712 +712 @@
 }
 
-static void drvNATNotifyApplyPortForwardCommand(PDRVNAT pThis, bool fRemove,
-                                                bool fUdp, const char *pHostIp,
-                                                uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort)
+static DECLCALLBACK(void) drvNATNotifyApplyPortForwardCommand(PDRVNAT pThis, bool fRemove,
+                                                              bool fUdp, const char *pHostIp,
+                                                              uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort)
 {
     struct in_addr guestIp, hostIp;

trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp

@@ -46 +46 @@
 }
 
-typedef struct {
+typedef struct LWIPCOREUSERCALLBACK
+{
     PFNRT1 pfn;
     void *pvUser;
@@ -64 +65 @@
 
 /**
- * @note: this function executes on TCPIP thread.
- */
-static void lwipCoreUserCallback(void *pvArg)
+ * @note this function executes on TCPIP thread.
+ */
+static void lwipCoreUserCallback(void *pvArg) RT_NOTHROW_DEF
 {
     LogFlowFunc(("ENTER: pvArg:%p\n", pvArg));
@@ -81 +82 @@
 
 /**
- * @note: this function executes on TCPIP thread.
- */
-static void lwipCoreInitDone(void *pvArg)
+ * @note this function executes on TCPIP thread.
+ */
+static void lwipCoreInitDone(void *pvArg) RT_NOTHROW_DEF
 {
     LogFlowFunc(("ENTER: pvArg:%p\n", pvArg));
@@ -95 +96 @@
 
 /**
- * @note: this function executes on TCPIP thread.
- */
-static void lwipCoreFiniDone(void *pvArg)
+ * @note this function executes on TCPIP thread.
+ */
+static void lwipCoreFiniDone(void *pvArg) RT_NOTHROW_DEF
 {
     LogFlowFunc(("ENTER: pvArg:%p\n", pvArg));

trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h

@@ -23 +23 @@
 #endif
 
-
-typedef DECLCALLBACKPTR(void, PFNRT1)(void *);
-
 /**
- * initiliazes LWIP core, and do callback on tcp/ip thread
+ * Initializes LWIP core, and do callback on tcp/ip thread.
  */
 int vboxLwipCoreInitialize(PFNRT1 pfnCallback, void * pfnCallbackArg);
 void vboxLwipCoreFinalize(PFNRT1 pfnCallback, void * pfnCallbackArg);
+
 #endif /* !VBOX_INCLUDED_SRC_Network_lwip_new_vbox_VBoxLwipCore_h */

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -76 +76 @@
  * @param   pvUser2     The second user argument.
  */
-typedef DECLCALLBACK(void) FNSUPDRVDESTRUCTOR(void *pvObj, void *pvUser1, void *pvUser2);
+typedef DECLCALLBACKTYPE(void, FNSUPDRVDESTRUCTOR,(void *pvObj, void *pvUser1, void *pvUser2));
 /** Pointer to a FNSUPDRVDESTRUCTOR(). */
 typedef FNSUPDRVDESTRUCTOR *PFNSUPDRVDESTRUCTOR;