parent
3daf7a2d0f
commit
19ad73568a
23
src/ior.c
23
src/ior.c
|
@ -363,9 +363,11 @@ static void CheckFileSize(IOR_test_t *test, char * testFilename, IOR_offset_t da
|
||||||
static size_t
|
static size_t
|
||||||
CompareData(void *expectedBuffer, size_t size, IOR_offset_t transferCount, IOR_param_t *test, IOR_offset_t offset, int fillrank, int access)
|
CompareData(void *expectedBuffer, size_t size, IOR_offset_t transferCount, IOR_param_t *test, IOR_offset_t offset, int fillrank, int access)
|
||||||
{
|
{
|
||||||
|
assert(access == WRITECHECK || access == READCHECK);
|
||||||
|
|
||||||
char testFileName[MAX_PATHLEN];
|
char testFileName[MAX_PATHLEN];
|
||||||
char bufferLabel1[MAX_STR];
|
char * bufferLabel1 = "Expected: ";
|
||||||
char bufferLabel2[MAX_STR];
|
char * bufferLabel2 = "Actual: ";
|
||||||
size_t i, j, length;
|
size_t i, j, length;
|
||||||
size_t errorCount = 0;
|
size_t errorCount = 0;
|
||||||
|
|
||||||
|
@ -379,13 +381,6 @@ CompareData(void *expectedBuffer, size_t size, IOR_offset_t transferCount, IOR_p
|
||||||
|
|
||||||
unsigned long long *testbuf = (unsigned long long *)expectedBuffer;
|
unsigned long long *testbuf = (unsigned long long *)expectedBuffer;
|
||||||
|
|
||||||
if (access == WRITECHECK || access == READCHECK) {
|
|
||||||
strcpy(bufferLabel1, "Expected: ");
|
|
||||||
strcpy(bufferLabel2, "Actual: ");
|
|
||||||
} else {
|
|
||||||
ERR("incorrect argument for CompareData()");
|
|
||||||
}
|
|
||||||
|
|
||||||
length = size / sizeof(IOR_size_t);
|
length = size / sizeof(IOR_size_t);
|
||||||
if (verbose >= VERBOSE_3) {
|
if (verbose >= VERBOSE_3) {
|
||||||
fprintf(out_logfile,
|
fprintf(out_logfile,
|
||||||
|
@ -442,6 +437,7 @@ CompareData(void *expectedBuffer, size_t size, IOR_offset_t transferCount, IOR_p
|
||||||
}else if(verbose >= VERBOSE_2){
|
}else if(verbose >= VERBOSE_2){
|
||||||
fprintf(out_logfile, "[%d] comparison successful during transfer %lld offset %lld\n", rank, transferCount, offset);
|
fprintf(out_logfile, "[%d] comparison successful during transfer %lld offset %lld\n", rank, transferCount, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (errorCount);
|
return (errorCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1916,9 +1912,13 @@ static IOR_offset_t WriteOrRead(IOR_param_t *test, IOR_results_t *results,
|
||||||
point->stonewall_min_data_accessed /1024.0 / 1024 / 1024, point->stonewall_avg_data_accessed / 1024.0 / 1024 / 1024 , point->stonewall_time);
|
point->stonewall_min_data_accessed /1024.0 / 1024 / 1024, point->stonewall_avg_data_accessed / 1024.0 / 1024 / 1024 , point->stonewall_time);
|
||||||
}
|
}
|
||||||
if(pairCnt != point->pairs_accessed){
|
if(pairCnt != point->pairs_accessed){
|
||||||
// some work needs still to be done !
|
// some work needs still to be done, complete the current block !
|
||||||
|
i--;
|
||||||
|
if(j == offsets){
|
||||||
|
j = 0; // current block is completed
|
||||||
|
}
|
||||||
for ( ; pairCnt < point->pairs_accessed; i++) {
|
for ( ; pairCnt < point->pairs_accessed; i++) {
|
||||||
for ( ; j < offsets && pairCnt < point->pairs_accessed ; j++) {
|
for ( ; j < offsets && pairCnt < point->pairs_accessed ; j++) {
|
||||||
IOR_offset_t offset;
|
IOR_offset_t offset;
|
||||||
if (test->randomOffset) {
|
if (test->randomOffset) {
|
||||||
if(test->filePerProc){
|
if(test->filePerProc){
|
||||||
|
@ -1937,6 +1937,7 @@ static IOR_offset_t WriteOrRead(IOR_param_t *test, IOR_results_t *results,
|
||||||
dataMoved += WriteOrReadSingle(offset, pretendRank, test->transferSize, & transferCount, & errors, test, fd, ioBuffers, access);
|
dataMoved += WriteOrReadSingle(offset, pretendRank, test->transferSize, & transferCount, & errors, test, fd, ioBuffers, access);
|
||||||
pairCnt++;
|
pairCnt++;
|
||||||
}
|
}
|
||||||
|
j = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
|
Loading…
Reference in New Issue