Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Enable four sorting threads by default in the command-line shell. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | threads |
Files: | files | file ages | folders |
SHA1: |
1cab83577c814feb35b4fb91af0d52a9 |
User & Date: | drh 2014-03-25 14:12:16.989 |
Context
2014-03-26
| ||
19:45 | Merge from trunk the fix for the crash on a corrupt database. (check-in: 8cb2b02baa user: drh tags: threads) | |
2014-03-25
| ||
14:12 | Enable four sorting threads by default in the command-line shell. (check-in: 1cab83577c user: drh tags: threads) | |
13:17 | Merge all fixes and enhancements from trunk. (check-in: b415dfb6cb user: drh tags: threads) | |
Changes
Changes to src/shell.c.
︙ | ︙ | |||
3528 3529 3530 3531 3532 3533 3534 | data->mode = MODE_List; memcpy(data->separator,"|", 2); data->showHeader = 0; sqlite3_config(SQLITE_CONFIG_URI, 1); sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data); sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> "); sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> "); | < | 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 | data->mode = MODE_List; memcpy(data->separator,"|", 2); data->showHeader = 0; sqlite3_config(SQLITE_CONFIG_URI, 1); sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data); sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> "); sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> "); } /* ** Output text to the console in a font that attracts extra attention. */ #ifdef _WIN32 static void printBold(const char *zText){ |
︙ | ︙ |
Changes to src/threads.c.
︙ | ︙ | |||
24 25 26 27 28 29 30 | ** This interface exists so that applications that want to take advantage ** of multiple cores can do so, while also allowing applications to stay ** single-threaded if desired. */ #include "sqliteInt.h" /********************************* Unix Pthreads ****************************/ | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | ** This interface exists so that applications that want to take advantage ** of multiple cores can do so, while also allowing applications to stay ** single-threaded if desired. */ #include "sqliteInt.h" /********************************* Unix Pthreads ****************************/ #if SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) && SQLITE_THREADSAFE>0 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */ #include <pthread.h> /* A running thread */ struct SQLiteThread { pthread_t tid; |
︙ | ︙ | |||
81 82 83 84 85 86 87 | } #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */ /******************************** End Unix Pthreads *************************/ /********************************* Win32 Threads ****************************/ | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | } #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */ /******************************** End Unix Pthreads *************************/ /********************************* Win32 Threads ****************************/ #if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */ #include <process.h> /* A running thread */ struct SQLiteThread { uintptr_t tid; /* The thread handle */ |
︙ | ︙ |
Changes to src/vdbesort.c.
︙ | ︙ | |||
27 28 29 30 31 32 33 | /* ** Maximum number of threads to use. Setting this value to 1 forces all ** operations to be single-threaded. */ #ifndef SQLITE_MAX_SORTER_THREAD | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | /* ** Maximum number of threads to use. Setting this value to 1 forces all ** operations to be single-threaded. */ #ifndef SQLITE_MAX_SORTER_THREAD # define SQLITE_MAX_SORTER_THREAD 4 #endif /* ** Candidate values for SorterThread.eWork */ #define SORTER_THREAD_SORT 1 #define SORTER_THREAD_TO_PMA 2 |
︙ | ︙ |