| 1 |
145 |
olivier.gi |
7c7
|
| 2 |
|
|
< * Version: C, Version 2.1
|
| 3 |
|
|
---
|
| 4 |
|
|
> * Version: C, Version 2.0
|
| 5 |
|
|
9c9
|
| 6 |
|
|
< * File: dhry.h (part 1 of 3)
|
| 7 |
|
|
---
|
| 8 |
|
|
> * File: dhry_global.h (part 1 of 3)
|
| 9 |
|
|
11c11
|
| 10 |
|
|
< * Date: May 25, 1988
|
| 11 |
|
|
---
|
| 12 |
|
|
> * Date: March 3, 1988
|
| 13 |
|
|
30c30
|
| 14 |
|
|
< * In addition, Berkeley UNIX system calls "times ()" or "time ()"
|
| 15 |
|
|
---
|
| 16 |
|
|
> * In addition, UNIX system calls "times ()" or "time ()"
|
| 17 |
|
|
44c44
|
| 18 |
|
|
< * Please send results to Rick Richardson and/or Reinhold Weicker.
|
| 19 |
|
|
---
|
| 20 |
|
|
> * Please send results to Reinhold Weicker and/or Rick Richardson.
|
| 21 |
|
|
59c59
|
| 22 |
|
|
< * History: This version C/2.1 has been made for two reasons:
|
| 23 |
|
|
---
|
| 24 |
|
|
> * History: This version C/2.0 has been made for two reasons:
|
| 25 |
|
|
123,129d122
|
| 26 |
|
|
< * Version 2.1 is identical to version 2.0 distributed via
|
| 27 |
|
|
< * the UNIX network Usenet in March 1988 except that it corrects
|
| 28 |
|
|
< * some minor deficiencies that were found by users of version 2.0.
|
| 29 |
|
|
< * The only change within the measurement loop is that a
|
| 30 |
|
|
< * non-executed "else" part was added to the "if" statement in
|
| 31 |
|
|
< * Func_3, and a non-executed "else" part removed from Proc_3.
|
| 32 |
|
|
< *
|
| 33 |
|
|
165,167c158,160
|
| 34 |
|
|
< * -DHZ=nnn
|
| 35 |
|
|
< * In Berkeley UNIX, the function "times" returns process
|
| 36 |
|
|
< * time in 1/HZ seconds, with HZ = 60 for most systems.
|
| 37 |
|
|
---
|
| 38 |
|
|
> * -DHZ=nnn (default: 60)
|
| 39 |
|
|
> * The function "times" returns process times in
|
| 40 |
|
|
> * 1/HZ seconds, with HZ = 60 for most systems.
|
| 41 |
|
|
169c162
|
| 42 |
|
|
< * A VALUE.
|
| 43 |
|
|
---
|
| 44 |
|
|
> * THE DEFAULT VALUE.
|
| 45 |
|
|
176,178c169,171
|
| 46 |
|
|
< * - dhry.h (this file, containing global definitions and comments)
|
| 47 |
|
|
< * - dhry_1.c (containing the code corresponding to Ada package Pack_1)
|
| 48 |
|
|
< * - dhry_2.c (containing the code corresponding to Ada package Pack_2)
|
| 49 |
|
|
---
|
| 50 |
|
|
> * - dhry_global.h (this file, containing global definitions and comments)
|
| 51 |
|
|
> * - dhry_pack_1.c (containing the code corresponding to Ada package Pack_1)
|
| 52 |
|
|
> * - dhry_pack_2.c (containing the code corresponding to Ada package Pack_2)
|
| 53 |
|
|
350a344
|
| 54 |
|
|
> #ifndef TIMES
|
| 55 |
|
|
353,354c347,354
|
| 56 |
|
|
< /* Use times(2) time function unless */
|
| 57 |
|
|
< /* explicitly defined otherwise */
|
| 58 |
|
|
---
|
| 59 |
|
|
> #endif
|
| 60 |
|
|
> /* Use "times" function for measurement */
|
| 61 |
|
|
> /* unless explicitly defined otherwise */
|
| 62 |
|
|
> #ifndef HZ
|
| 63 |
|
|
> #define HZ 60
|
| 64 |
|
|
> #endif
|
| 65 |
|
|
> /* Use HZ = 60 for "times" function */
|
| 66 |
|
|
> /* unless explicitly defined otherwise */
|
| 67 |
|
|
363c363
|
| 68 |
|
|
< /* Berkeley UNIX C returns process times in seconds/HZ */
|
| 69 |
|
|
---
|
| 70 |
|
|
> /* UNIX C returns process times in seconds/HZ */
|
| 71 |
|
|
7c7
|
| 72 |
|
|
< * Version: C, Version 2.1
|
| 73 |
|
|
---
|
| 74 |
|
|
> * Version: C, Version 2.0
|
| 75 |
|
|
9c9
|
| 76 |
|
|
< * File: dhry_1.c (part 2 of 3)
|
| 77 |
|
|
---
|
| 78 |
|
|
> * File: dhry_pack_1.c (part 2 of 3)
|
| 79 |
|
|
11c11
|
| 80 |
|
|
< * Date: May 25, 1988
|
| 81 |
|
|
---
|
| 82 |
|
|
> * Date: March 3, 1988
|
| 83 |
|
|
18c18
|
| 84 |
|
|
< #include "dhry.h"
|
| 85 |
|
|
---
|
| 86 |
|
|
> #include "dhry_global.h"
|
| 87 |
|
|
50,51d49
|
| 88 |
|
|
< #define Too_Small_Time 120
|
| 89 |
|
|
< /* Measurements should last at least about 2 seconds */
|
| 90 |
|
|
55a54,55
|
| 91 |
|
|
> #endif
|
| 92 |
|
|
>
|
| 93 |
|
|
58d57
|
| 94 |
|
|
< #endif
|
| 95 |
|
|
73a73
|
| 96 |
|
|
>
|
| 97 |
|
|
84a85
|
| 98 |
|
|
>
|
| 99 |
|
|
99,100c100,102
|
| 100 |
|
|
< /* Was missing in published program. Without this statement, */
|
| 101 |
|
|
< /* Arr_2_Glob [8][7] would have an undefined value. */
|
| 102 |
|
|
---
|
| 103 |
|
|
> /* Was missing in published program. Without this */
|
| 104 |
|
|
> /* initialization, Arr_2_Glob [8][7] would have an */
|
| 105 |
|
|
> /* undefined value. */
|
| 106 |
|
|
105c107
|
| 107 |
|
|
< printf ("Dhrystone Benchmark, Version 2.1 (Language: C)\n");
|
| 108 |
|
|
---
|
| 109 |
|
|
> printf ("Dhrystone Benchmark, Version 2.0 (Language: C)\n");
|
| 110 |
|
|
281c283
|
| 111 |
|
|
< /******************/
|
| 112 |
|
|
---
|
| 113 |
|
|
> /**********************/
|
| 114 |
|
|
338c340
|
| 115 |
|
|
< /******************/
|
| 116 |
|
|
---
|
| 117 |
|
|
> /**********************/
|
| 118 |
|
|
347a350,351
|
| 119 |
|
|
> else /* not executed */
|
| 120 |
|
|
> Int_Glob = 100;
|
| 121 |
|
|
349a354
|
| 122 |
|
|
>
|
| 123 |
|
|
7c7
|
| 124 |
|
|
< * Version: C, Version 2.1
|
| 125 |
|
|
---
|
| 126 |
|
|
> * Version: C, Version 2.0
|
| 127 |
|
|
9c9
|
| 128 |
|
|
< * File: dhry_2.c (part 3 of 3)
|
| 129 |
|
|
---
|
| 130 |
|
|
> * File: dhry_pack_2.c (part 3 of 3)
|
| 131 |
|
|
11c11
|
| 132 |
|
|
< * Date: May 25, 1988
|
| 133 |
|
|
---
|
| 134 |
|
|
> * Date: March 3, 1988
|
| 135 |
|
|
18c18
|
| 136 |
|
|
< #include "dhry.h"
|
| 137 |
|
|
---
|
| 138 |
|
|
> #include "dhry_global.h"
|
| 139 |
|
|
189,190d188
|
| 140 |
|
|
< else /* not executed */
|
| 141 |
|
|
< return (false);
|
