VirtualBox

Changeset 105377 in vbox


Ignore:
Timestamp:
Jul 17, 2024 2:06:05 PM (9 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
164030
Message:

iprt/cdefs.h,*: s/RT_IPRT_CALL_ATTR/RT_IPRT_CALLREQ_ATTR/g bugref:10725

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/pdmdev.h

    r105352 r105377  
    34383438     */
    34393439    DECLR3CALLBACKMEMBER(int, pfnVMReqCallNoWaitV,(PPDMDEVINS pDevIns, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs,
    3440                                                    va_list Args)) RT_IPRT_CALL_ATTR(3, 4, 0);
     3440                                                   va_list Args)) RT_IPRT_CALLREQ_ATTR(3, 4, 0);
    34413441
    34423442    /**
    … …  
    34603460     */
    34613461    DECLR3CALLBACKMEMBER(int, pfnVMReqPriorityCallWaitV,(PPDMDEVINS pDevIns, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs,
    3462                                                          va_list Args)) RT_IPRT_CALL_ATTR(3, 4, 0);
     3462                                                         va_list Args)) RT_IPRT_CALLREQ_ATTR(3, 4, 0);
    34633463
    34643464    /**
    … …  
    76147614 * @remarks See remarks on VMR3ReqCallVU.
    76157615 */
    7616 DECLINLINE(int) RT_IPRT_CALL_ATTR(3, 4, 5)
     7616DECLINLINE(int) RT_IPRT_CALLREQ_ATTR(3, 4, 5)
    76177617PDMDevHlpVMReqCallNoWait(PPDMDEVINS pDevIns, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...)
    76187618{
    … …  
    76437643 * @remarks See remarks on VMR3ReqCallVU.
    76447644 */
    7645 DECLINLINE(int) RT_IPRT_CALL_ATTR(3, 4, 5)
     7645DECLINLINE(int) RT_IPRT_CALLREQ_ATTR(3, 4, 5)
    76467646PDMDevHlpVMReqPriorityCallWait(PPDMDEVINS pDevIns, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...)
    76477647{

  • trunk/include/VBox/vmm/vmapi.h

    r105352 r105377  
    445445#define VMREQ_F_EXTRA_ARGS_ALL_PTRS 0x00008000U
    446446VMMR3DECL(int)          VMR3ReqCallU(PUVM pUVM, VMCPUID idDstCpu, PVMREQ *ppReq, RTMSINTERVAL cMillies, uint32_t fFlags,
    447                                      PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(6, 7, 8);
     447                                     PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(6, 7, 8);
    448448VMMR3DECL(int)          VMR3ReqCallVU(PUVM pUVM, VMCPUID idDstCpu, PVMREQ *ppReq, RTMSINTERVAL cMillies, uint32_t fFlags,
    449                                       PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALL_ATTR(6, 7, 0);
    450 VMMR3_INT_DECL(int)     VMR3ReqCallWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    451 VMMR3DECL(int)          VMR3ReqCallWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    452 VMMR3DECL(int)          VMR3ReqCallNoWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    453 VMMR3DECL(int)          VMR3ReqCallNoWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    454 VMMR3_INT_DECL(int)     VMR3ReqCallVoidWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    455 VMMR3DECL(int)          VMR3ReqCallVoidWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    456 VMMR3DECL(int)          VMR3ReqCallVoidNoWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    457 VMMR3DECL(int)          VMR3ReqPriorityCallWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    458 VMMR3DECL(int)          VMR3ReqPriorityCallWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    459 VMMR3DECL(int)          VMR3ReqPriorityCallVoidWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
     449                                      PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALLREQ_ATTR(6, 7, 0);
     450VMMR3_INT_DECL(int)     VMR3ReqCallWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     451VMMR3DECL(int)          VMR3ReqCallWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     452VMMR3DECL(int)          VMR3ReqCallNoWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     453VMMR3DECL(int)          VMR3ReqCallNoWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     454VMMR3_INT_DECL(int)     VMR3ReqCallVoidWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     455VMMR3DECL(int)          VMR3ReqCallVoidWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     456VMMR3DECL(int)          VMR3ReqCallVoidNoWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     457VMMR3DECL(int)          VMR3ReqPriorityCallWait(PVM pVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     458VMMR3DECL(int)          VMR3ReqPriorityCallWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     459VMMR3DECL(int)          VMR3ReqPriorityCallVoidWaitU(PUVM pUVM, VMCPUID idDstCpu, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
    460460VMMR3DECL(int)          VMR3ReqAlloc(PUVM pUVM, PVMREQ *ppReq, VMREQTYPE enmType, VMCPUID idDstCpu);
    461461VMMR3DECL(int)          VMR3ReqFree(PVMREQ pReq);

  • trunk/include/iprt/cdefs.h

    r105352 r105377  
    15131513#endif
    15141514
    1515 /** @def RT_IPRT_CALL_ATTR
    1516  * Identifies a function taking an IPRT format string.
     1515/** @def RT_IPRT_CALREQL_ATTR
     1516 * Identifies a function taking a function call request with parameter list and
     1517 * everything for asynchronous execution.
    15171518 * @param   a_iFn   The index (1-based) of the function pointer argument.
    15181519 * @param   a_iArgc The index (1-based) of the argument count.
    … …  
    15211522 */
    15221523#if defined(__GNUC__) && defined(WITH_IPRT_CALL_ATTRIBUTE)
    1523 # define RT_IPRT_CALL_ATTR(a_iFn, a_iArgc, a_iArgs)   __attribute__((__iprt_call__(a_iFn, a_iArgc, a_iArgs)))
    1524 #else
    1525 # define RT_IPRT_CALL_ATTR(a_iFn, a_iArgc, a_iArgs)
     1524# define RT_IPRT_CALLREQ_ATTR(a_iFn, a_iArgc, a_iArgs)   __attribute__((__iprt_callreq__(a_iFn, a_iArgc, a_iArgs)))
     1525#else
     1526# define RT_IPRT_CALLREQ_ATTR(a_iFn, a_iArgc, a_iArgs)
    15261527#endif
    15271528

  • trunk/include/iprt/req.h

    r105353 r105377  
    173173 */
    174174RTDECL(int) RTReqQueueCall(RTREQQUEUE hQueue, PRTREQ *ppReq, RTMSINTERVAL cMillies,
    175                            PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(4, 5, 6);
     175                           PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(4, 5, 6);
    176176
    177177/**
    … …  
    201201 */
    202202RTDECL(int) RTReqQueueCallVoid(RTREQQUEUE hQueue, PRTREQ *ppReq, RTMSINTERVAL cMillies,
    203                                PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(4, 5, 6);
     203                               PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(4, 5, 6);
    204204
    205205/**
    … …  
    232232 */
    233233RTDECL(int) RTReqQueueCallEx(RTREQQUEUE hQueue, PRTREQ *ppReq, RTMSINTERVAL cMillies, unsigned fFlags,
    234                              PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(5, 6, 7);
     234                             PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(5, 6, 7);
    235235
    236236/**
    … …  
    278278 */
    279279RTDECL(int) RTReqQueueCallV(RTREQQUEUE hQueue, PRTREQ *ppReq, RTMSINTERVAL cMillies, unsigned fFlags,
    280                             PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALL_ATTR(5, 6, 0);
     280                            PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALLREQ_ATTR(5, 6, 0);
    281281
    282282/**

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

    r105353 r105377  
    7070static DECLCALLBACK(int)    vgsvcGstCtrlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
    7171                                                        uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
     72static int                  vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, bool fAsync, RTMSINTERVAL cMsTimeout,
     73                                                          PFNRT pfnFunction, unsigned cArgs,
     74                                                          va_list Args) RT_IPRT_CALLREQ_ATTR(4, 5, 0); /* attrib req prototype */
     75static int                  vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, PFNRT pfnFunction,
     76                                                            unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(2, 3, 4); /* ditto */
     77#if 0 /* unused */
     78static int                  vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL cMsTimeout,
     79                                                           PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     80#endif
    7281
    7382
    … …  
    20822091
    20832092
    2084 static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
    2085                                          bool fAsync, RTMSINTERVAL uTimeoutMS,
    2086                                          PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALL_ATTR(5, 6, 0)
    2087 {
    2088     RT_NOREF1(pHostCtx);
     2093static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, bool fAsync, RTMSINTERVAL cMsTimeout,
     2094                                         PFNRT pfnFunction, unsigned cArgs, va_list Args)
     2095{
    20892096    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
    2090     /* pHostCtx is optional. */
    20912097    AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
    20922098    if (!fAsync)
    … …  
    20972103    {
    20982104#ifdef DEBUG
    2099         VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV fAsync=%RTbool, uTimeoutMS=%RU32, cArgs=%u\n",
    2100                      pProcess->uPID, fAsync, uTimeoutMS, cArgs);
     2105        VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV fAsync=%RTbool, cMsTimeout=%RU32, cArgs=%u\n",
     2106                     pProcess->uPID, fAsync, cMsTimeout, cArgs);
    21012107#endif
    21022108        uint32_t fFlags = RTREQFLAGS_IPRT_STATUS;
    21032109        if (fAsync)
    21042110        {
    2105             Assert(uTimeoutMS == 0);
     2111            Assert(cMsTimeout == 0);
    21062112            fFlags |= RTREQFLAGS_NO_WAIT;
    21072113        }
    21082114
    21092115        PRTREQ hReq = NIL_RTREQ;
    2110         rc = RTReqQueueCallV(pProcess->hReqQueue, &hReq, uTimeoutMS, fFlags, pfnFunction, cArgs, Args);
     2116        rc = RTReqQueueCallV(pProcess->hReqQueue, &hReq, cMsTimeout, fFlags, pfnFunction, cArgs, Args);
    21112117        RTReqRelease(hReq);
    21122118        if (RT_SUCCESS(rc))
    … …  
    21432149
    21442150
    2145 static int vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
    2146                                            PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5)
     2151static int vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, PFNRT pfnFunction, unsigned cArgs, ...)
     2152{
     2153    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
     2154    AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
     2155
     2156    va_list va;
     2157    va_start(va, cArgs);
     2158    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, true /* fAsync */, 0 /* cMsTimeout */,
     2159                                           pfnFunction, cArgs, va);
     2160    va_end(va);
     2161
     2162    return rc;
     2163}
     2164
     2165
     2166#if 0 /* unused */
     2167static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL cMsTimeout,
     2168                                          PFNRT pfnFunction, unsigned cArgs, ...)
    21472169{
    21482170    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
    … …  
    21522174    va_list va;
    21532175    va_start(va, cArgs);
    2154     int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, true /* fAsync */, 0 /* uTimeoutMS */,
     2176    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, false /* fAsync */, cMsTimeout,
    21552177                                           pfnFunction, cArgs, va);
    21562178    va_end(va);
    … …  
    21582180    return rc;
    21592181}
    2160 
    2161 
    2162 #if 0 /* unused */
    2163 static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
    2164                                           RTMSINTERVAL uTimeoutMS, PFNRT pfnFunction, unsigned cArgs, ...)
    2165 {
    2166     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
    2167     /* pHostCtx is optional. */
    2168     AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
    2169 
    2170     va_list va;
    2171     va_start(va, cArgs);
    2172     int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, false /* fAsync */, uTimeoutMS,
    2173                                            pfnFunction, cArgs, va);
    2174     va_end(va);
    2175 
    2176     return rc;
    2177 }
    21782182#endif
    21792183
    … …  
    21832187{
    21842188    if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
    2185         return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnInput, 5 /*cArgs*/,
     2189        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnInput, 5 /*cArgs*/,
    21862190                                               pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
    21872191
    … …  
    21942198{
    21952199    if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
    2196         return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnOutput, 5 /*cArgs*/,
     2200        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnOutput, 5 /*cArgs*/,
    21972201                                               pProcess, pHostCtx, uHandle, cbToRead, fFlags);
    21982202
    … …  
    22042208{
    22052209    if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
    2206         return vgsvcGstCtrlProcessRequestAsync(pProcess, NULL /* pHostCtx */, (PFNRT)vgsvcGstCtrlProcessOnTerm, 1 /*cArgs*/,
    2207                                                pProcess);
     2210        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnTerm, 1 /*cArgs*/, pProcess);
    22082211
    22092212    return vgsvcGstCtrlProcessOnTerm(pProcess);

  • trunk/src/VBox/Devices/Network/slirp/libslirp.h

    r105353 r105377  
    8484
    8585int slirp_call(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies,
    86                unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(5, 6, 7);
     86               unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(5, 6, 7);
    8787
    8888int slirp_call_hostres(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies,
    89                        unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(5, 6, 7);
     89                       unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(5, 6, 7);
    9090
    9191

  • trunk/src/VBox/Devices/USB/VUSBInternal.h

    r105353 r105377  
    505505DECLHIDDEN(void) vusbDevCancelAllUrbs(PVUSBDEV pDev, bool fDetaching);
    506506DECLHIDDEN(int) vusbDevIoThreadExecV(PVUSBDEV pDev, uint32_t fFlags, PFNRT pfnFunction,
    507                                      unsigned cArgs, va_list Args) RT_IPRT_CALL_ATTR(3, 4, 0);
     507                                     unsigned cArgs, va_list Args) RT_IPRT_CALLREQ_ATTR(3, 4, 0);
    508508DECLHIDDEN(int) vusbDevIoThreadExec(PVUSBDEV pDev, uint32_t fFlags, PFNRT pfnFunction,
    509                                     unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5);
    510 DECLHIDDEN(int) vusbDevIoThreadExecSync(PVUSBDEV pDev, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(2, 3, 4);
     509                                    unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
     510DECLHIDDEN(int) vusbDevIoThreadExecSync(PVUSBDEV pDev, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(2, 3, 4);
    511511DECLHIDDEN(int) vusbUrbCancelWorker(PVUSBURB pUrb, CANCELMODE enmMode);
    512512

  • trunk/src/VBox/Runtime/include/internal/thread.h

    r105353 r105377  
    291291DECLHIDDEN(bool) rtThreadPosixPriorityProxyStart(void);
    292292DECLHIDDEN(int)  rtThreadPosixPriorityProxyCall(PRTTHREADINT pTargetThread, PFNRT pfnFunction,
    293                                                 int cArgs, ...) RT_IPRT_CALL_ATTR(2, 3, 4);
     293                                                int cArgs, ...) RT_IPRT_CALLREQ_ATTR(2, 3, 4);
    294294# endif
    295295#endif
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette