Integration adjustments for the vtshim module.

FossilOrigin-Name: bf2e28ddb292ef0b9a1262ec249aed3243dcfb20

diff --git a/ext/misc/vtshim.c b/ext/misc/vtshim.c
index aea7a086eb7d08ed61db1968da32dfb0df8cd667..b6b46f1a23b873696ee872b0f59db7f391dbd257 100644 (file)
--- a/ext/misc/vtshim.c
+++ b/ext/misc/vtshim.c
@@ -11,7 +11,7 @@
 *************************************************************************
 **
 ** A shim that sits between the SQLite virtual table interface and
-** managed memory of .NET
+** runtimes with garbage collector based memory management.
 */
 #include "sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
@@ -32,9 +32,9 @@ typedef struct vtshim_cursor vtshim_cursor;
 struct vtshim_aux {
   void *pChildAux;              /* pAux for child virtual tables */
   void (*xChildDestroy)(void*); /* Destructor for pChildAux */
-  const sqlite3_module *pMod;   /* Methods for child virtual tables */
+  sqlite3_module *pMod;         /* Methods for child virtual tables */
   sqlite3 *db;                  /* The database to which we are attached */
-  const char *zName;            /* Name of the module */
+  char *zName;                  /* Name of the module */
   int bDisposed;                /* True if disposed */
   vtshim_vtab *pAllVtab;        /* List of all vtshim_vtab objects */
   sqlite3_module sSelf;         /* Methods used by this shim */
@@ -324,9 +324,24 @@ static void vtshimAuxDestructor(void *pXAux){
   if( !pAux->bDisposed && pAux->xChildDestroy ){
     pAux->xChildDestroy(pAux->pChildAux);
   }
+  sqlite3_free(pAux->zName);
+  sqlite3_free(pAux->pMod);
   sqlite3_free(pAux);
 }
 
+static int vtshimCopyModule(
+  const sqlite3_module *pMod,   /* Source module to be copied */
+  sqlite3_module **ppMod        /* Destination for copied module */
+){
+  sqlite3_module *p;
+  if( !pMod || !ppMod ) return SQLITE_ERROR;
+  p = sqlite3_malloc( sizeof(*p) );
+  if( p==0 ) return SQLITE_NOMEM;
+  memcpy(p, pMod, sizeof(*p));
+  *ppMod = p;
+  return SQLITE_OK;
+}
+
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -338,20 +353,26 @@ void *sqlite3_create_disposable_module(
   void(*xDestroy)(void*)     /* Module destructor function */
 ){
   vtshim_aux *pAux;
+  sqlite3_module *pMod;
   int rc;
   pAux = sqlite3_malloc( sizeof(*pAux) );
   if( pAux==0 ){
     if( xDestroy ) xDestroy(pClientData);
     return 0;
   }
+  rc = vtshimCopyModule(p, &pMod);
+  if( rc!=SQLITE_OK ){
+    sqlite3_free(pAux);
+    return 0;
+  }
   pAux->pChildAux = pClientData;
   pAux->xChildDestroy = xDestroy;
-  pAux->pMod = p;
+  pAux->pMod = pMod;
   pAux->db = db;
-  pAux->zName = zName;
+  pAux->zName = sqlite3_mprintf("%s", zName);
   pAux->bDisposed = 0;
   pAux->pAllVtab = 0;
-  pAux->sSelf.iVersion = p->iVersion<=1 ? p->iVersion : 1;
+  pAux->sSelf.iVersion = p->iVersion<=2 ? p->iVersion : 2;
   pAux->sSelf.xCreate = p->xCreate ? vtshimCreate : 0;
   pAux->sSelf.xConnect = p->xConnect ? vtshimConnect : 0;
   pAux->sSelf.xBestIndex = p->xBestIndex ? vtshimBestIndex : 0;
@@ -371,7 +392,7 @@ void *sqlite3_create_disposable_module(
   pAux->sSelf.xRollback = p->xRollback ? vtshimRollback : 0;
   pAux->sSelf.xFindFunction = p->xFindFunction ? vtshimFindFunction : 0;
   pAux->sSelf.xRename = p->xRename ? vtshimRename : 0;
-  if( p->iVersion>=1 ){
+  if( p->iVersion>=2 ){
     pAux->sSelf.xSavepoint = p->xSavepoint ? vtshimSavepoint : 0;
     pAux->sSelf.xRelease = p->xRelease ? vtshimRelease : 0;
     pAux->sSelf.xRollbackTo = p->xRollbackTo ? vtshimRollbackTo : 0;

diff --git a/manifest b/manifest
index 56a52aafa816587a077cfcf350b5d23f6badffda..c5cbf66d22733768c9719c22e8900bf8a2946379 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sprototype\sfor\san\sextension\sthat\ssits\sin\sbetween\sthe\sSQLite\snative\scode\nvirtual\stable\sinterface\sand\sa\sCLR\sIDisposable\sobject.
-D 2013-06-13T00:32:29.814
+C Integration\sadjustments\sfor\sthe\svtshim\smodule.
+D 2013-06-20T00:20:39.235
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -115,7 +115,7 @@ F ext/misc/percentile.c 4fb5e46c4312b0be74e8e497ac18f805f0e3e6c5
 F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0
 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
 F ext/misc/spellfix.c 6d7ce6105a4b7729f6c44ccdf1ab7e80d9707c02
-F ext/misc/vtshim.c 43a4f04d932f558a1d99c9ec275463e66dd14dfc
+F ext/misc/vtshim.c 5cf883f9c728bdd10aa30c8d1c1be63d0b62fba7
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14
@@ -1096,10 +1096,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c 4d0393bdbe7230adb712e925863744dd2b7ffc5b
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P e120c558a5bafc0f0d2cc12ee5c9d36e20cc642d
-R cebd45a542cce51f8d9efaf858e2a635
-T *branch * disposable-vtable
-T *sym-disposable-vtable *
-T -sym-nextgen-query-plan-exp *
-U drh
-Z 5aa82f98e9ac53c787753e9130a0c71d
+P 10bba8d0821159a45c6a0d6c3cef897cb4d4e9a6
+R 24de2c5f1d52b8803f44f37f1161bbcd
+U mistachkin
+Z adcba7194ddb7aa8bcd6f83d9da3034b

diff --git a/manifest.uuid b/manifest.uuid
index 22caf63f4e441a156dcc1154777f43ee591d1e06..39976ef9a6fe166b18a11d2f28e958befd7cfd51 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10bba8d0821159a45c6a0d6c3cef897cb4d4e9a6
\ No newline at end of file
+bf2e28ddb292ef0b9a1262ec249aed3243dcfb20
\ No newline at end of file