|
@@ -94,7 +94,7 @@ static void _beginthread(VoidFunction x, void * z) {
|
|
|
pthread_create(&pt, &pa, x, z);
|
|
|
}
|
|
|
|
|
|
-static void warmup(char **blkp, int num_chunks) {
|
|
|
+static void warmup(char **blkpa, int num_chunks) {
|
|
|
int cblks;
|
|
|
long victim;
|
|
|
long blk_size;
|
|
@@ -102,27 +102,27 @@ static void warmup(char **blkp, int num_chunks) {
|
|
|
|
|
|
for(cblks = 0; cblks < num_chunks; cblks++) {
|
|
|
blk_size = min_size + lran2(&rgen) % (max_size - min_size);
|
|
|
- blkp[cblks] = (char *) malloc((size_t) blk_size);
|
|
|
+ blkpa[cblks] = (char *) malloc((size_t) blk_size);
|
|
|
blksize[cblks] = blk_size;
|
|
|
- assert(blkp[cblks] != NULL);
|
|
|
+ assert(blkpa[cblks] != NULL);
|
|
|
}
|
|
|
|
|
|
/* generate a random permutation of the chunks */
|
|
|
for(cblks = num_chunks; cblks > 0 ; cblks--) {
|
|
|
victim = lran2(&rgen) % cblks;
|
|
|
- tmp = blkp[victim];
|
|
|
- blkp[victim] = blkp[cblks-1];
|
|
|
- blkp[cblks-1] = (char *) tmp;
|
|
|
+ tmp = blkpa[victim];
|
|
|
+ blkpa[victim] = blkpa[cblks-1];
|
|
|
+ blkpa[cblks-1] = (char *) tmp;
|
|
|
}
|
|
|
|
|
|
for(cblks=0; cblks < 4 * num_chunks; cblks++) {
|
|
|
victim = lran2(&rgen) % num_chunks;
|
|
|
- free(blkp[victim]);
|
|
|
+ free(blkpa[victim]);
|
|
|
|
|
|
blk_size = min_size + lran2(&rgen) % (max_size - min_size);
|
|
|
- blkp[victim] = (char *) malloc((size_t) blk_size);
|
|
|
+ blkpa[victim] = (char *) malloc((size_t) blk_size);
|
|
|
blksize[victim] = blk_size;
|
|
|
- assert(blkp[victim] != NULL);
|
|
|
+ assert(blkpa[victim] != NULL);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -159,7 +159,7 @@ static void * exercise_heap( void *pinput) {
|
|
|
volatile char * chptr = ((char *) pdea->array[victim]);
|
|
|
*chptr++ = 'a';
|
|
|
volatile char ch = *((char *) pdea->array[victim]);
|
|
|
- *chptr = 'b';
|
|
|
+ ch = 'b';
|
|
|
|
|
|
|
|
|
if( stopflag ) break;
|
|
@@ -195,8 +195,8 @@ static void runthreads(long sleep_cnt, int min_threads, int max_threads, int chp
|
|
|
double duration ;
|
|
|
|
|
|
double rate_1 = 0, rate_n;
|
|
|
- size_t reqd_space;
|
|
|
- size_t used_space;
|
|
|
+ /* size_t reqd_space; */
|
|
|
+ /* size_t used_space; */
|
|
|
|
|
|
QueryPerformanceFrequency( &ticks_per_sec );
|
|
|
|