SQLite: Check-in [33fa0410]

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

Overview

Comment:	Disable worker threads when SQLITE_THREADSAFE=0. Set the default compile-time maximum number of worker threads to 8 and honor the SQLITE_DEFAULT_WORKER_THREADS compile-time constant (which defaults to 0).
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| threads
Files:	files \| file ages \| folders
SHA1:	33fa0410499900dd8beb44b9a8ffbd9f4b68c8d8
User & Date:	drh 2014-08-29 19:06:07

Context

2014-09-01
17:36		Add support for using separate worker threads to speed large sorts. The SQLITE_MAX_WORKER_THREADS and SQLITE_DEFAULT_WORKER_THREADS compile-time options and the SQLITE_LIMIT_WORKER_THREADS argument to sqlite3_limit() and the "PRAGMA threads=N" pragma are added. (check-in: b1c0f0bc user: drh tags: trunk)
2014-08-29
19:06		Disable worker threads when SQLITE_THREADSAFE=0. Set the default compile-time maximum number of worker threads to 8 and honor the SQLITE_DEFAULT_WORKER_THREADS compile-time constant (which defaults to 0). (Closed-Leaf check-in: 33fa0410 user: drh tags: threads)
18:06		Fix the speedtest1.c test program to set the worker thread count using the threads pragma. (check-in: 2ab4b5ad user: drh tags: threads)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

  2494   2494     db->errMask = 0xff;
  2495   2495     db->nDb = 2;
  2496   2496     db->magic = SQLITE_MAGIC_BUSY;
  2497   2497     db->aDb = db->aDbStatic;
  2498   2498   
  2499   2499     assert( sizeof(db->aLimit)==sizeof(aHardLimit) );
  2500   2500     memcpy(db->aLimit, aHardLimit, sizeof(db->aLimit));
  2501         -  db->aLimit[SQLITE_LIMIT_WORKER_THREADS] = 0;
         2501  +  db->aLimit[SQLITE_LIMIT_WORKER_THREADS] = SQLITE_DEFAULT_WORKER_THREADS;
  2502   2502     db->autoCommit = 1;
  2503   2503     db->nextAutovac = -1;
  2504   2504     db->szMmap = sqlite3GlobalConfig.szMmap;
  2505   2505     db->nextPagesize = 0;
  2506   2506     db->nMaxSorterMmap = 0x7FFFFFFF;
  2507   2507     db->flags |= SQLITE_ShortColNames | SQLITE_EnableTrigger | SQLITE_CacheSpill
  2508   2508   #if !defined(SQLITE_DEFAULT_AUTOMATIC_INDEX) || SQLITE_DEFAULT_AUTOMATIC_INDEX

Changes to src/sqliteInt.h.

    436    437    438    439    440    441    442     443    444    445    446    447     448    449    450    451    452    453    454

class="diffln"> 435 435 #endif 436 437 /* 438 ** If no value has been provided for SQLITE_MAX_WORKER_THREADS, or if 439 ** SQLITE_TEMP_STORE is set to 3 (never use temporary files), set it 440 ** to zero. 441 */ -#if SQLITE_TEMP_STORE==3 442 +#if SQLITE_TEMP_STORE==3 || SQLITE_THREADSAFE==0 443 # undef SQLITE_MAX_WORKER_THREADS 444 # define SQLITE_MAX_WORKER_THREADS 0 445 #endif 446 #ifndef SQLITE_MAX_WORKER_THREADS -# define SQLITE_MAX_WORKER_THREADS 4 447 +# define SQLITE_MAX_WORKER_THREADS 8 448 #endif 449 #ifndef SQLITE_DEFAULT_WORKER_THREADS 450 # define SQLITE_DEFAULT_WORKER_THREADS 0 451 #endif 452 #if SQLITE_DEFAULT_WORKER_THREADS>SQLITE_MAX_WORKER_THREADS 453 # undef SQLITE_MAX_WORKER_THREADS 454 # define SQLITE_MAX_WORKER_THREADS SQLITE_DEFAULT_WORKER_THREADS