Fossil SCM
Fixed a logic error in the only-run-once timer init code.
Commit
9fab0f8125c57c7509ea8b0a9ea8c86ee86f5968
Parent
799458977efbd13…
1 file changed
+2
-1
+2
-1
| --- src/util.c | ||
| +++ src/util.c | ||
| @@ -186,11 +186,11 @@ | ||
| 186 | 186 | sqlite3_uint64 u; /* "User" CPU times */ |
| 187 | 187 | sqlite3_uint64 s; /* "System" CPU times */ |
| 188 | 188 | int id; /* positive if allocated, else 0. */ |
| 189 | 189 | } fossilTimer = { 0U, 0U, 0 }; |
| 190 | 190 | enum FossilTimerEnum { |
| 191 | - FOSSIL_TIMER_COUNT = 10 /* Number of timers we can stack. */ | |
| 191 | + FOSSIL_TIMER_COUNT = 10 /* Number of timers we can track. */ | |
| 192 | 192 | }; |
| 193 | 193 | static struct FossilTimer fossilTimerList[FOSSIL_TIMER_COUNT] = {{0,0,0}}; |
| 194 | 194 | |
| 195 | 195 | /* |
| 196 | 196 | ** Stores the current CPU times into the shared timer list |
| @@ -208,10 +208,11 @@ | ||
| 208 | 208 | */ |
| 209 | 209 | int fossil_timer_start(){ |
| 210 | 210 | int i; |
| 211 | 211 | static char once = 0; |
| 212 | 212 | if(!once){ |
| 213 | + once = 1; | |
| 213 | 214 | memset(&fossilTimerList, 0, |
| 214 | 215 | sizeof(fossilTimerList)/sizeof(fossilTimerList[0])); |
| 215 | 216 | } |
| 216 | 217 | for( i = 0; i < FOSSIL_TIMER_COUNT; ++i ){ |
| 217 | 218 | struct FossilTimer * ft = &fossilTimerList[i]; |
| 218 | 219 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -186,11 +186,11 @@ | |
| 186 | sqlite3_uint64 u; /* "User" CPU times */ |
| 187 | sqlite3_uint64 s; /* "System" CPU times */ |
| 188 | int id; /* positive if allocated, else 0. */ |
| 189 | } fossilTimer = { 0U, 0U, 0 }; |
| 190 | enum FossilTimerEnum { |
| 191 | FOSSIL_TIMER_COUNT = 10 /* Number of timers we can stack. */ |
| 192 | }; |
| 193 | static struct FossilTimer fossilTimerList[FOSSIL_TIMER_COUNT] = {{0,0,0}}; |
| 194 | |
| 195 | /* |
| 196 | ** Stores the current CPU times into the shared timer list |
| @@ -208,10 +208,11 @@ | |
| 208 | */ |
| 209 | int fossil_timer_start(){ |
| 210 | int i; |
| 211 | static char once = 0; |
| 212 | if(!once){ |
| 213 | memset(&fossilTimerList, 0, |
| 214 | sizeof(fossilTimerList)/sizeof(fossilTimerList[0])); |
| 215 | } |
| 216 | for( i = 0; i < FOSSIL_TIMER_COUNT; ++i ){ |
| 217 | struct FossilTimer * ft = &fossilTimerList[i]; |
| 218 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -186,11 +186,11 @@ | |
| 186 | sqlite3_uint64 u; /* "User" CPU times */ |
| 187 | sqlite3_uint64 s; /* "System" CPU times */ |
| 188 | int id; /* positive if allocated, else 0. */ |
| 189 | } fossilTimer = { 0U, 0U, 0 }; |
| 190 | enum FossilTimerEnum { |
| 191 | FOSSIL_TIMER_COUNT = 10 /* Number of timers we can track. */ |
| 192 | }; |
| 193 | static struct FossilTimer fossilTimerList[FOSSIL_TIMER_COUNT] = {{0,0,0}}; |
| 194 | |
| 195 | /* |
| 196 | ** Stores the current CPU times into the shared timer list |
| @@ -208,10 +208,11 @@ | |
| 208 | */ |
| 209 | int fossil_timer_start(){ |
| 210 | int i; |
| 211 | static char once = 0; |
| 212 | if(!once){ |
| 213 | once = 1; |
| 214 | memset(&fossilTimerList, 0, |
| 215 | sizeof(fossilTimerList)/sizeof(fossilTimerList[0])); |
| 216 | } |
| 217 | for( i = 0; i < FOSSIL_TIMER_COUNT; ++i ){ |
| 218 | struct FossilTimer * ft = &fossilTimerList[i]; |
| 219 |