diff options
Diffstat (limited to 'dis/original/Update/update.c')
-rw-r--r-- | dis/original/Update/update.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dis/original/Update/update.c b/dis/original/Update/update.c index 51e1530..92384cd 100644 --- a/dis/original/Update/update.c +++ b/dis/original/Update/update.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <time.h> | 18 | #include <time.h> |
19 | #include<assert.h> | 19 | #include<assert.h> |
20 | #include "DISstressmarkRNG.h" | 20 | #include "DISstressmarkRNG.h" |
21 | #include "extra.h" | ||
21 | 22 | ||
22 | #define MIN_FIELD_SIZE 16 | 23 | #define MIN_FIELD_SIZE 16 |
23 | 24 | ||
@@ -39,7 +40,7 @@ | |||
39 | *main() | 40 | *main() |
40 | */ | 41 | */ |
41 | 42 | ||
42 | int main(){ | 43 | int main(int argc, char** argv){ |
43 | 44 | ||
44 | unsigned int *field; | 45 | unsigned int *field; |
45 | unsigned int f; | 46 | unsigned int f; |
@@ -76,6 +77,7 @@ int main(){ | |||
76 | field[l] = randInt(0, f-w); | 77 | field[l] = randInt(0, f-w); |
77 | } | 78 | } |
78 | 79 | ||
80 | SET_UP | ||
79 | startTime = time(NULL); | 81 | startTime = time(NULL); |
80 | 82 | ||
81 | hops = 0; | 83 | hops = 0; |
@@ -90,6 +92,7 @@ int main(){ | |||
90 | unsigned int max, min; | 92 | unsigned int max, min; |
91 | unsigned int partition; | 93 | unsigned int partition; |
92 | unsigned int high; | 94 | unsigned int high; |
95 | START_LOOP | ||
93 | max = MAX_FIELD_SIZE; | 96 | max = MAX_FIELD_SIZE; |
94 | min = 0; | 97 | min = 0; |
95 | high = 0; | 98 | high = 0; |
@@ -122,6 +125,7 @@ int main(){ | |||
122 | field[index] = sum % (f-w); | 125 | field[index] = sum % (f-w); |
123 | index = (partition+hops)%(f-w); | 126 | index = (partition+hops)%(f-w); |
124 | hops++; | 127 | hops++; |
128 | STOP_LOOP | ||
125 | }/* end for loop */ | 129 | }/* end for loop */ |
126 | 130 | ||
127 | startTime = time(NULL) - startTime; | 131 | startTime = time(NULL) - startTime; |
@@ -129,5 +133,6 @@ int main(){ | |||
129 | fprintf(stdout, "%u hops\n", hops); | 133 | fprintf(stdout, "%u hops\n", hops); |
130 | fprintf(stderr, "total time = %u seconds.\n", (unsigned int)startTime); | 134 | fprintf(stderr, "total time = %u seconds.\n", (unsigned int)startTime); |
131 | free(field); | 135 | free(field); |
136 | WRITE_TO_FILE | ||
132 | return(1); | 137 | return(1); |
133 | } | 138 | } |