Changeset 62734 in vbox for trunk/src/VBox/Storage
- Timestamp:
- Jul 30, 2016 11:55:29 AM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 109312
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Storage/testcase/tstVDIo.cpp
r62482 r62734 509 509 static DECLCALLBACK(int) vdScriptCallbackPrint(PVDSCRIPTARG paScriptArgs, void *pvUser) 510 510 { 511 NOREF(pvUser); 511 512 RTPrintf(paScriptArgs[0].psz); 512 513 return VINF_SUCCESS; … … 515 516 static DECLCALLBACK(void) tstVDError(void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va) 516 517 { 518 NOREF(pvUser); 517 519 RTPrintf("tstVDIo: Error %Rrc at %s:%u (%s): ", rc, RT_SRC_POS_ARGS); 518 520 RTPrintfV(pszFormat, va); … … 522 524 static DECLCALLBACK(int) tstVDMessage(void *pvUser, const char *pszFormat, va_list va) 523 525 { 526 NOREF(pvUser); 524 527 RTPrintf("tstVDIo: "); 525 528 RTPrintfV(pszFormat, va); … … 554 557 bool fIgnoreFlush = false; 555 558 bool fHonorSame = false; 556 PVDIOBACKEND pIoBackend = NULL;557 559 558 560 pcszDisk = paScriptArgs[0].psz; … … 710 712 uint64_t cbIo = 0; 711 713 uint64_t cbBlkSize = 0; 712 bool fDataProviderRnd = false;713 bool fPrintStats = false;714 714 uint64_t offStart = 0; 715 715 uint64_t offEnd = 0; … … 1643 1643 static DECLCALLBACK(int) vdScriptHandlerIoRngDestroy(PVDSCRIPTARG paScriptArgs, void *pvUser) 1644 1644 { 1645 RT_NOREF1(paScriptArgs); 1645 1646 PVDTESTGLOB pGlob = (PVDTESTGLOB)pvUser; 1646 1647 … … 1767 1768 static DECLCALLBACK(int) vdScriptHandlerSleep(PVDSCRIPTARG paScriptArgs, void *pvUser) 1768 1769 { 1769 int rc = VINF_SUCCESS;1770 RT_NOREF1(pvUser); 1770 1771 uint64_t cMillies = paScriptArgs[0].u64; 1771 1772 1772 rc = RTThreadSleep(cMillies);1773 int rc = RTThreadSleep(cMillies); 1773 1774 return rc; 1774 1775 } … … 1999 2000 static DECLCALLBACK(int) vdScriptHandlerPrintMsg(PVDSCRIPTARG paScriptArgs, void *pvUser) 2000 2001 { 2002 RT_NOREF1(pvUser); 2001 2003 RTPrintf("%s\n", paScriptArgs[0].psz); 2002 2004 return VINF_SUCCESS; … … 2194 2196 static DECLCALLBACK(int) tstVDIoFileClose(void *pvUser, void *pStorage) 2195 2197 { 2198 RT_NOREF1(pvUser); 2196 2199 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2197 2200 … … 2242 2245 static DECLCALLBACK(int) tstVDIoFileMove(void *pvUser, const char *pcszSrc, const char *pcszDst, unsigned fMove) 2243 2246 { 2247 RT_NOREF1(fMove); 2244 2248 int rc = VINF_SUCCESS; 2245 2249 PVDTESTGLOB pGlob = (PVDTESTGLOB)pvUser; … … 2276 2280 static DECLCALLBACK(int) tstVDIoFileGetFreeSpace(void *pvUser, const char *pcszFilename, int64_t *pcbFreeSpace) 2277 2281 { 2282 RT_NOREF2(pvUser, pcszFilename); 2278 2283 AssertPtrReturn(pcbFreeSpace, VERR_INVALID_POINTER); 2279 2284 … … 2284 2289 static DECLCALLBACK(int) tstVDIoFileGetModificationTime(void *pvUser, const char *pcszFilename, PRTTIMESPEC pModificationTime) 2285 2290 { 2291 RT_NOREF2(pvUser, pcszFilename); 2286 2292 AssertPtrReturn(pModificationTime, VERR_INVALID_POINTER); 2287 2293 … … 2292 2298 static DECLCALLBACK(int) tstVDIoFileGetSize(void *pvUser, void *pStorage, uint64_t *pcbSize) 2293 2299 { 2300 RT_NOREF1(pvUser); 2294 2301 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2295 2302 … … 2299 2306 static DECLCALLBACK(int) tstVDIoFileSetSize(void *pvUser, void *pStorage, uint64_t cbSize) 2300 2307 { 2308 RT_NOREF1(pvUser); 2301 2309 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2302 2310 … … 2306 2314 static DECLCALLBACK(int) tstVDIoFileSetAllocationSize(void *pvUser, void *pStorage, uint64_t cbSize, uint32_t fFlags) 2307 2315 { 2316 RT_NOREF4(pvUser, pStorage, cbSize, fFlags); 2308 2317 return VERR_NOT_SUPPORTED; 2309 2318 } … … 2312 2321 const void *pvBuffer, size_t cbBuffer, size_t *pcbWritten) 2313 2322 { 2323 RT_NOREF1(pvUser); 2314 2324 int rc = VINF_SUCCESS; 2315 2325 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; … … 2336 2346 void *pvBuffer, size_t cbBuffer, size_t *pcbRead) 2337 2347 { 2348 RT_NOREF1(pvUser); 2338 2349 int rc = VINF_SUCCESS; 2339 2350 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; … … 2359 2370 static DECLCALLBACK(int) tstVDIoFileFlushSync(void *pvUser, void *pStorage) 2360 2371 { 2372 RT_NOREF1(pvUser); 2361 2373 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2362 2374 int rc = VDIoBackendTransfer(pIoStorage->pFile->pIoStorage, VDIOTXDIR_FLUSH, 0, … … 2371 2383 void **ppTask) 2372 2384 { 2373 int rc = VINF_SUCCESS;2374 PVDTESTGLOB pGlob = (PVDTESTGLOB)pvUser;2385 RT_NOREF2(pvUser, ppTask); 2386 int rc = VINF_SUCCESS; 2375 2387 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2376 2388 RTSGBUF SgBuf; … … 2393 2405 void **ppTask) 2394 2406 { 2395 int rc = VINF_SUCCESS;2396 PVDTESTGLOB pGlob = (PVDTESTGLOB)pvUser;2407 RT_NOREF2(pvUser, ppTask); 2408 int rc = VINF_SUCCESS; 2397 2409 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2398 2410 RTSGBUF SgBuf; … … 2413 2425 void **ppTask) 2414 2426 { 2415 int rc = VINF_SUCCESS;2416 PVDTESTGLOB pGlob = (PVDTESTGLOB)pvUser;2427 RT_NOREF2(pvUser, ppTask); 2428 int rc = VINF_SUCCESS; 2417 2429 PVDSTORAGE pIoStorage = (PVDSTORAGE)pStorage; 2418 2430 … … 2450 2462 : pIoTest->offEnd - pIoTest->offStart; 2451 2463 2452 pIoTest->u.Rnd.cBlocks = cbRange / cbBlkSize + ((cbRange % cbBlkSize) ? 1 : 0);2464 pIoTest->u.Rnd.cBlocks = (uint32_t)(cbRange / cbBlkSize + (cbRange % cbBlkSize ? 1 : 0)); 2453 2465 pIoTest->u.Rnd.cBlocksLeft = pIoTest->u.Rnd.cBlocks; 2454 2466 pIoTest->u.Rnd.pbMapAccessed = (uint8_t *)RTMemAllocZ(pIoTest->u.Rnd.cBlocks / 8 … … 2590 2602 static DECLCALLBACK(void) tstVDIoTestReqComplete(void *pvUser1, void *pvUser2, int rcReq) 2591 2603 { 2604 RT_NOREF1(rcReq); 2592 2605 PVDIOREQ pIoReq = (PVDIOREQ)pvUser1; 2593 2606 RTSEMEVENT hEventSem = (RTSEMEVENT)pvUser2;
Note:
See TracChangeset
for help on using the changeset viewer.