Initial attempt at making sqlite3_interrupt() work even when called from

a separate thread. (CVS 3335)

FossilOrigin-Name: 35fd67d7a0c55797eb460e3bd02c96afe619f026

diff --git a/manifest b/manifest
index 7c92a4b5c44770cb0a73ed514ccafdbb3e205abd..fe3c09bc8cb9fdd9867507ea692335533adceb4c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sdatabase\swrites\sfrom\swithin\svirtual\stable\smodule\sxSync()\scallbacks.\s(CVS\s3334)
-D 2006-07-25T15:14:53
+C Initial\sattempt\sat\smaking\ssqlite3_interrupt()\swork\seven\swhen\scalled\sfrom\na\sseparate\sthread.\s(CVS\s3335)
+D 2006-07-26T01:39:30
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -49,7 +49,7 @@ F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c 63f01d3f4e0ba7ed171934a24aece2191824faec
 F src/legacy.c 10e01a902d7f2c872c7922fedf19a2df70935857
 F src/loadext.c 040853b36adf535bba6a2e9f5d921422a4394baf
-F src/main.c 14937db8a0c383598f1901fcc308cf9126ef62ae
+F src/main.c 494d3750d0969404a7747ff45cf0226fd6e42abf
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 3fd6a022bafd620fdfd779a51dccb42f31c97f75
@@ -74,7 +74,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 359551ab5cdd8f8fe5f3fe170fd330b108b08d7d
 F src/sqlite.h.in 432848ac7f8d7e6fea727668acccec62bdd86cc4
 F src/sqlite3ext.h c611255287e9a11ce4f1fe6251c2a0b9d32a828b
-F src/sqliteInt.h a413094c83dd3e79f129afb9d453b5680651176b
+F src/sqliteInt.h 670d36af1fe0fe1933e0a5abf26558873f3ff481
 F src/table.c d8817f43a6c6bf139487db161760b9e1e02da3f1
 F src/tclsqlite.c 92a997ee5caca4923a6452ff8ebfaa8d37334f4a
 F src/test1.c 535294d7f21a4127082c4f7a57f225482df9cc36
@@ -91,17 +91,17 @@ F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
 F src/test_schema.c 8b2aaa9136edf3187a51166849c2de0aaaa27ce5
 F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
 F src/test_tclvar.c 6611657977c69bccd32b4ff7ccfb221a403ca2f0
-F src/tokenize.c 7b448440dfd6e984d6bef7ac7fc60f1d26eaf8e7
+F src/tokenize.c 288e860be49a20a18dfe7456e7a8948aee5d2c26
 F src/trigger.c 0fc40125820409a6274834a6e04ad804d96e2793
 F src/update.c 951f95ef044cf6d28557c48dc35cb0711a0b9129
 F src/utf.c ab81ac59084ff1c07d421eb1a0a84ec809603b44
-F src/util.c c8ada8bab6b8822084d05c270d160867d3714aaf
+F src/util.c 5409031819ee4672c5f9c3ac7cf517e267a25845
 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
-F src/vdbe.c 3ffc96ec2e870b3ab3e59d1f6fe34687e4ed1db6
+F src/vdbe.c c20911652577abc0afb683b5214e04fab6659a0f
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
 F src/vdbeInt.h e3eaab262b67b84474625cfc38aec1125c32834b
 F src/vdbeapi.c 6af0e7160af260052a7a4500464221a03dada75f
-F src/vdbeaux.c 0088120c4e321f680d2728d26770f35c10dc64b1
+F src/vdbeaux.c 1047944652093a6583a308ec89e8e517e8951d2e
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c 1fe25b3e59f92ed1f29b63ac9c6f954eb6907a29
@@ -376,7 +376,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4207ebc4e107df9f9f046be652f061e53263c8dd
-R b62c9f53d5d9aafa4e186b1b50a281ff
-U danielk1977
-Z 4145b3acb8db85dcd373c4df89f46175
+P d5a608d0a412e13dfced6a3827574a2cff802f25
+R 8e7083ca7f3cd7ca6f02160c3ed214e7
+U drh
+Z f2c6da8c85bcdb4581d0e12508de1697

diff --git a/manifest.uuid b/manifest.uuid
index 69a0145916d084b42c3ca87e1d87b6abed089eff..a0313ddd5c5bf69f72a7832bcb739e4ad2429ca4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5a608d0a412e13dfced6a3827574a2cff802f25
\ No newline at end of file
+35fd67d7a0c55797eb460e3bd02c96afe619f026
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 72d1a7abbc6b71dfc5ef09f3a71f7e11cdea0019..0a8ab426a2e4fded4ce46eae3eb42d751344638d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.352 2006/07/11 14:17:52 drh Exp $
+** $Id: main.c,v 1.353 2006/07/26 01:39:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -382,8 +382,8 @@ int sqlite3_busy_timeout(sqlite3 *db, int ms){
 ** Cause any pending operation to stop at its earliest opportunity.
 */
 void sqlite3_interrupt(sqlite3 *db){
-  if( !sqlite3SafetyCheck(db) ){
-    db->flags |= SQLITE_Interrupt;
+  if( db && (db->magic==SQLITE_MAGIC_OPEN || db->magic==SQLITE_MAGIC_BUSY) ){
+    db->u1.isInterrupted = 1;
   }
 }
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 145fab2d068194ec400caba2c53eb721fd7de7e6..d5e4376c939a9e512fcdc03814e0414dc9c3396f 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.521 2006/07/11 14:17:52 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.522 2006/07/26 01:39:30 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -481,6 +481,10 @@ struct sqlite3 {
   sqlite3_value *pErr;          /* Most recent error message */
   char *zErrMsg;                /* Most recent error message (UTF-8 encoded) */
   char *zErrMsg16;              /* Most recent error message (UTF-16 encoded) */
+  union {
+    int isInterrupted;          /* True if sqlite3_interrupt has been called */
+    double notUsed1;            /* Spacer */
+  } u1;
 #ifndef SQLITE_OMIT_AUTHORIZATION
   int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
                                 /* Access authorization function */
@@ -520,7 +524,6 @@ struct sqlite3 {
 ** transaction is active on that particular database file.
 */
 #define SQLITE_VdbeTrace      0x00000001  /* True to trace VDBE execution */
-#define SQLITE_Interrupt      0x00000004  /* Cancel current operation */
 #define SQLITE_InTrans        0x00000008  /* True if in a transaction */
 #define SQLITE_InternChanges  0x00000010  /* Uncommitted Hash table changes */
 #define SQLITE_FullColNames   0x00000020  /* Show full column names on SELECT */

diff --git a/src/tokenize.c b/src/tokenize.c
index ea584b1cd355aebbbd91d9719bae028a2f9fcc2e..04da0dcd338a1b492f6499f33eafccad46f55a4b 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.121 2006/06/24 08:51:05 danielk1977 Exp $
+** $Id: tokenize.c,v 1.122 2006/07/26 01:39:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -394,7 +394,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   extern void sqlite3ParserFree(void*, void(*)(void*));
   extern int sqlite3Parser(void*, int, Token, Parse*);
 
-  db->flags &= ~SQLITE_Interrupt;
+  db->u1.isInterrupted = 0;
   pParse->rc = SQLITE_OK;
   i = 0;
   pEngine = sqlite3ParserAlloc((void*(*)(int))sqlite3MallocX);
@@ -418,7 +418,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
     switch( tokenType ){
       case TK_SPACE:
       case TK_COMMENT: {
-        if( (db->flags & SQLITE_Interrupt)!=0 ){
+        if( db->u1.isInterrupted ){
           pParse->rc = SQLITE_INTERRUPT;
           sqlite3SetString(pzErrMsg, "interrupt", (char*)0);
           goto abort_parse;

diff --git a/src/util.c b/src/util.c
index 79885b04ddcd7eeb62c74b9326127e8bcc4dc403..905477d1f50648c36eefe30a7f556637a66053ff 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.191 2006/07/11 12:40:25 drh Exp $
+** $Id: util.c,v 1.192 2006/07/26 01:39:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1151,7 +1151,7 @@ int sqlite3SafetyOn(sqlite3 *db){
     return 0;
   }else if( db->magic==SQLITE_MAGIC_BUSY ){
     db->magic = SQLITE_MAGIC_ERROR;
-    db->flags |= SQLITE_Interrupt;
+    db->u1.isInterrupted = 1;
   }
   return 1;
 }
@@ -1167,7 +1167,7 @@ int sqlite3SafetyOff(sqlite3 *db){
     return 0;
   }else if( db->magic==SQLITE_MAGIC_OPEN ){
     db->magic = SQLITE_MAGIC_ERROR;
-    db->flags |= SQLITE_Interrupt;
+    db->u1.isInterrupted = 1;
   }
   return 1;
 }

diff --git a/src/vdbe.c b/src/vdbe.c
index 5fda3338add71b9058b07497647d9ba1dd38dbc3..2038908892bfb333b1797eb791f4719f64aed4a0 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.570 2006/06/28 18:18:09 drh Exp $
+** $Id: vdbe.c,v 1.571 2006/07/26 01:39:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -61,8 +61,8 @@ int sqlite3_search_count = 0;
 
 /*
 ** When this global variable is positive, it gets decremented once before
-** each instruction in the VDBE.  When reaches zero, the SQLITE_Interrupt
-** of the db.flags field is set in order to simulate and interrupt.
+** each instruction in the VDBE.  When reaches zero, the u1.isInterrupted
+** field of the sqlite3 structure is set in order to simulate and interrupt.
 **
 ** This facility is used for testing purposes only.  It does not function
 ** in an ordinary build.
@@ -376,7 +376,7 @@ __inline__ unsigned long long int hwtime(void){
 ** flag on jump instructions, we get a (small) speed improvement.
 */
 #define CHECK_FOR_INTERRUPT \
-   if( db->flags & SQLITE_Interrupt ) goto abort_due_to_interrupt;
+   if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
 
 
 /*
@@ -4970,8 +4970,8 @@ abort_due_to_error:
   ** flag.
   */
 abort_due_to_interrupt:
-  assert( db->flags & SQLITE_Interrupt );
-  db->flags &= ~SQLITE_Interrupt;
+  assert( db->u1.isInterrupted );
+  db->u1.isInterrupted = 0;
   if( db->magic!=SQLITE_MAGIC_BUSY ){
     rc = SQLITE_MISUSE;
   }else{

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index e7b005839088b20ab5b397cde0932e53c62d4cbc..08361d1855ea8b484a788bf5786a8db23a36ce53 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -670,8 +670,8 @@ int sqlite3VdbeList(
   if( i>=p->nOp ){
     p->rc = SQLITE_OK;
     rc = SQLITE_DONE;
-  }else if( db->flags & SQLITE_Interrupt ){
-    db->flags &= ~SQLITE_Interrupt;
+  }else if( db->u1.isInterrupted ){
+    db->u1.isInterrupted = 0;
     p->rc = SQLITE_INTERRUPT;
     rc = SQLITE_ERROR;
     sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(p->rc), (char*)0);