Fossil

Changes On Branch multi-thread
Login

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

Changes In Branch multi-thread Excluding Merge-Ins

This is equivalent to a diff from f82e054fd6 to 1e4aaf7b2e

2020-05-25
17:28
Update the built-in SQLite to version 3.32.1. ... (check-in: bb713f1337 user: drh tags: trunk)
2020-05-22
20:16
Merge trunk ... (Leaf check-in: 1e4aaf7b2e user: jan.nijtmans tags: multi-thread)
17:54
Update the built-in SQLite to version 3.32.0. ... (check-in: f82e054fd6 user: drh tags: trunk)
16:19
Clean shutdown in the "fossil sql" command. ... (check-in: fbb15cc4a8 user: drh tags: trunk)
2020-01-28
20:39
Merge trunk ... (check-in: 9dbea18c71 user: jan.nijtmans tags: multi-thread)

Changes to src/db.c.
1274
1275
1276
1277
1278
1279
1280



1281
1282
1283
1284
1285
1286
1287
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290







+
+
+







    db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0
  );
  if( g.fSqlTrace ) sqlite3_trace_v2(db, SQLITE_TRACE_PROFILE, db_sql_trace, 0);
  db_add_aux_functions(db);
  re_add_sql_func(db);  /* The REGEXP operator */
  foci_register(db);    /* The "files_of_checkin" virtual table */
  sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0);
#if USE_SYSTEM_SQLITE+0==1
  sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.maxWorkerThreads);
#endif
  return db;
}


/*
** Detaches the zLabel database.
*/
1764
1765
1766
1767
1768
1769
1770




1771
1772
1773
1774
1775
1776
1777
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784







+
+
+
+







  db_open_or_attach(g.zRepositoryName, "repository");
  g.repositoryOpen = 1;
  sqlite3_file_control(g.db, "repository", SQLITE_FCNTL_DATA_VERSION,
                       &g.iRepoDataVers);
  /* Cache "allow-symlinks" option, because we'll need it on every stat call */
  g.allowSymlinks = db_get_boolean("allow-symlinks",
                                   db_allow_symlinks_by_default());
  /* Cache "max-wthreads" option */
#if USE_SYSTEM_SQLITE+0==1
  g.maxWorkerThreads = db_get_int("max-wthreads", 0);
#endif
  g.zAuxSchema = db_get("aux-schema","");
  g.eHashPolicy = db_get_int("hash-policy",-1);
  if( g.eHashPolicy<0 ){
    g.eHashPolicy = hname_default_policy();
    db_set_int("hash-policy", g.eHashPolicy, 0);
  }

3538
3539
3540
3541
3542
3543
3544









3545
3546
3547
3548
3549
3550
3551
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567







+
+
+
+
+
+
+
+
+







** when running as a web-server, Fossil does not open the
** global configuration database.
*/
/*
** SETTING: max-upload       width=25 default=250000
** A limit on the size of uplink HTTP requests.
*/
#if USE_SYSTEM_SQLITE+0==1
/*
** SETTING: max-wthreads     width=16 default=0
** The maximum number of auxiliary worker threads that a
** single prepared statement may start.  Only works when
** using the system SQLite library and when that library
** was compiled with support for threading.
*/
#endif
/*
** SETTING: mimetypes        width=40 versionable block-text
** A list of file extension-to-mimetype mappings, one per line. e.g.
** "foo application/x-foo". File extensions are compared
** case-insensitively in the order listed in this setting.  A leading
** '.' on file extensions is permitted but not required.
*/
Changes to src/main.c.
310
311
312
313
314
315
316



317
318
319
320
321
322
323
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326







+
+
+







      cson_value *v;
      cson_object *o;
    } reqPayload;              /* request payload object (if any) */
    cson_array *warnings;      /* response warnings */
    int timerId;               /* fetched from fossil_timer_start() */
  } json;
#endif /* FOSSIL_ENABLE_JSON */
#if USE_SYSTEM_SQLITE+0==1
  int maxWorkerThreads;          /* Cached "max-wthreads" option */
#endif
};

/*
** Macro for debugging:
*/
#define CGIDEBUG(X)  if( g.fDebug ) cgi_debug X

Changes to src/sqlcmd.c.
163
164
165
166
167
168
169



170
171
172
173
174
175
176
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179







+
+
+







*/
static int sqlcmd_autoinit(
  sqlite3 *db,
  const char **pzErrMsg,
  const void *notUsed
){
  int mTrace = SQLITE_TRACE_CLOSE;
#if USE_SYSTEM_SQLITE+0==1
  sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.maxWorkerThreads);
#endif
  add_content_sql_commands(db);
  db_add_aux_functions(db);
  re_add_sql_func(db);
  search_sql_setup(db);
  foci_register(db);
  deltafunc_init(db);
  g.repositoryOpen = 1;