Fossil

Check-in [af2f7d1749]
Login

Check-in [af2f7d1749]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:To avoid unnecessary clutter in the error log, do not write timeout message to the error log for timeouts that occur during web-page reply and that use less than one second of CPU time.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: af2f7d17493059ddfa7b103c70c1dce8faac7abe13a6bf8073f7235e15129f1d
User & Date: drh 2023-06-15 12:21:29.707
Context
2023-06-15
19:12
Fix a gap positions vs. adjacent chunks positions mix-up in the diff context loader. The test case to reveal this bug is the 2nd gap of commit diff [d6ddd5bcfa]. Congrats again to Stephan for this smart code! ... (check-in: 8347c4add1 user: florian tags: trunk)
12:21
To avoid unnecessary clutter in the error log, do not write timeout message to the error log for timeouts that occur during web-page reply and that use less than one second of CPU time. ... (check-in: af2f7d1749 user: drh tags: trunk)
11:58
Use the new timediff() function of SQLite 3.43.0 to refactor the "Duration of Project" line on the /stat page to be "Project Age". ... (check-in: 2abb23dba8 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
3004
3005
3006
3007
3008
3009
3010







3011
3012
3013
3014
3015
3016
3017
** is one) and exiting.
*/
#ifndef _WIN32
static int nAlarmSeconds = 0;
static void sigalrm_handler(int x){
  sqlite3_uint64 tmUser = 0, tmKernel = 0;
  fossil_cpu_times(&tmUser, &tmKernel);







  fossil_panic("Timeout after %d seconds during %s"
               " - user %,llu µs, sys %,llu µs",
               nAlarmSeconds, g.zPhase, tmUser, tmKernel);
}
#endif

/*







>
>
>
>
>
>
>







3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
** is one) and exiting.
*/
#ifndef _WIN32
static int nAlarmSeconds = 0;
static void sigalrm_handler(int x){
  sqlite3_uint64 tmUser = 0, tmKernel = 0;
  fossil_cpu_times(&tmUser, &tmKernel);
  if( fossil_strcmp(g.zPhase, "web-page reply")==0
   && tmUser+tmKernel<1000000
  ){
    /* Do not log time-outs during web-page reply unless more than
    ** 1 second of CPU time has been consumed */
    return;
  }
  fossil_panic("Timeout after %d seconds during %s"
               " - user %,llu µs, sys %,llu µs",
               nAlarmSeconds, g.zPhase, tmUser, tmKernel);
}
#endif

/*