Many new configuration options for fuzzershell.

FossilOrigin-Name: 41c954391690833bf2ece4ea14457ee4bdd74e90

1 files changed, 174 insertions, 5 deletions

diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index 6f841e220..e412e59b3 100644
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -47,7 +47,7 @@
 **    (for i in id:*; do echo '|****<'$i'>****|'; cat $i; done) >~/all-queue.txt
 **
 ** (Once again, change the "|" to "/") Then all elements of the AFL queue
-** can be run in a single go (for regression testing, for example, by typing:
+** can be run in a single go (for regression testing, for example) by typing:
 **
 **    fuzzershell -f ~/all-queue.txt >out.txt
 **
@@ -59,6 +59,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <ctype.h>
 #include "sqlite3.h"
 
 /*
@@ -98,6 +99,22 @@ static void fatalError(const char *zFormat, ...){
 }
 
 /*
+** Evaluate some SQL.  Abort if unable.
+*/
+static void sqlexec(sqlite3 *db, const char *zFormat, ...){
+  va_list ap;
+  char *zSql;
+  char *zErrMsg = 0;
+  int rc;
+  va_start(ap, zFormat);
+  zSql = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+  rc = sqlite3_exec(db, zSql, 0, 0, &zErrMsg);
+  if( rc ) abendError("failed sql [%s]: %s", zSql, zErrMsg);
+  sqlite3_free(zSql);
+}
+
+/*
 ** This callback is invoked by sqlite3_log().
 */
 static void shellLog(void *pNotUsed, int iErrCode, const char *zMsg){
@@ -226,12 +243,78 @@ static void showHelp(void){
   printf(
 "Read SQL text from standard input and evaluate it.\n"
 "Options:\n"
+"  --autovacuum        Enable AUTOVACUUM mode\n"
 "  -f FILE             Read SQL text from FILE instead of standard input\n"
+"  --heap SZ MIN       Memory allocator uses SZ bytes & min allocation MIN\n"
 "  --help              Show this help text\n"    
 "  --initdb DBFILE     Initialize the in-memory database using template DBFILE\n"
+"  --lookaside N SZ    Configure lookaside for N slots of SZ bytes each\n"
+"  --pagesize N        Set the page size to N\n"
+"  --pcache N SZ       Configure N pages of pagecache each of size SZ bytes\n"
+"  --scratch N SZ      Configure scratch memory for N slots of SZ bytes each\n"
+"  --utf16be           Set text encoding to UTF-16BE\n"
+"  --utf16le           Set text encoding to UTF-16LE\n"
   );
 }
 
+/*
+** Return the value of a hexadecimal digit.  Return -1 if the input
+** is not a hex digit.
+*/
+static int hexDigitValue(char c){
+  if( c>='0' && c<='9' ) return c - '0';
+  if( c>='a' && c<='f' ) return c - 'a' + 10;
+  if( c>='A' && c<='F' ) return c - 'A' + 10;
+  return -1;
+}
+
+/*
+** Interpret zArg as an integer value, possibly with suffixes.
+*/
+static int integerValue(const char *zArg){
+  sqlite3_int64 v = 0;
+  static const struct { char *zSuffix; int iMult; } aMult[] = {
+    { "KiB", 1024 },
+    { "MiB", 1024*1024 },
+    { "GiB", 1024*1024*1024 },
+    { "KB",  1000 },
+    { "MB",  1000000 },
+    { "GB",  1000000000 },
+    { "K",   1000 },
+    { "M",   1000000 },
+    { "G",   1000000000 },
+  };
+  int i;
+  int isNeg = 0;
+  if( zArg[0]=='-' ){
+    isNeg = 1;
+    zArg++;
+  }else if( zArg[0]=='+' ){
+    zArg++;
+  }
+  if( zArg[0]=='0' && zArg[1]=='x' ){
+    int x;
+    zArg += 2;
+    while( (x = hexDigitValue(zArg[0]))>=0 ){
+      v = (v<<4) + x;
+      zArg++;
+    }
+  }else{
+    while( isdigit(zArg[0]) ){
+      v = v*10 + zArg[0] - '0';
+      zArg++;
+    }
+  }
+  for(i=0; i<sizeof(aMult)/sizeof(aMult[0]); i++){
+    if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
+      v *= aMult[i].iMult;
+      break;
+    }
+  }
+  if( v>0x7fffffff ) abendError("parameter too large - max 2147483648");
+  return (int)(isNeg? -v : v);
+}
+
 
 int main(int argc, char **argv){
   char *zIn = 0;          /* Input text */
@@ -246,6 +329,18 @@ int main(int argc, char **argv){
   sqlite3 *dbInit = 0;    /* On-disk database used to initialize the in-memory db */
   const char *zInitDb = 0;/* Name of the initialization database file */
   char *zErrMsg = 0;      /* Error message returned from sqlite3_exec() */
+  const char *zEncoding = 0;    /* --utf16be or --utf16le */
+  int nHeap = 0, mnHeap = 0;    /* Heap size from --heap */
+  int nLook = 0, szLook = 0;    /* --lookaside configuration */
+  int nPCache = 0, szPCache = 0;/* --pcache configuration */
+  int nScratch = 0, szScratch=0;/* --scratch configuration */
+  int pageSize = 0;             /* Desired page size.  0 means default */
+  void *pHeap = 0;              /* Allocated heap space */
+  void *pLook = 0;              /* Allocated lookaside space */
+  void *pPCache = 0;            /* Allocated storage for pcache */
+  void *pScratch = 0;           /* Allocated storage for scratch */
+  int doAutovac = 0;            /* True for --autovacuum */
+
 
   g.zArgv0 = argv[0];
   for(i=1; i<argc; i++){
@@ -253,19 +348,56 @@ int main(int argc, char **argv){
     if( z[0]=='-' ){
       z++;
       if( z[0]=='-' ) z++;
-      if( strcmp(z,"help")==0 ){
-        showHelp();
-        return 0;
+      if( strcmp(z,"autovacuum")==0 ){
+        doAutovac = 1;
       }else
       if( strcmp(z, "f")==0 && i+1<argc ){
         if( in!=stdin ) abendError("only one -f allowed");
         in = fopen(argv[++i],"rb");
         if( in==0 )  abendError("cannot open input file \"%s\"", argv[i]);
       }else
+      if( strcmp(z,"heap")==0 ){
+        if( i>=argc-2 ) abendError("missing arguments on %s\n", argv[i]);
+        nHeap = integerValue(argv[i+1]);
+        mnHeap = integerValue(argv[i+2]);
+        i += 2;
+      }else
+      if( strcmp(z,"help")==0 ){
+        showHelp();
+        return 0;
+      }else
       if( strcmp(z, "initdb")==0 && i+1<argc ){
         if( zInitDb!=0 ) abendError("only one --initdb allowed");
         zInitDb = argv[++i];
       }else
+      if( strcmp(z,"lookaside")==0 ){
+        if( i>=argc-2 ) abendError("missing arguments on %s", argv[i]);
+        nLook = integerValue(argv[i+1]);
+        szLook = integerValue(argv[i+2]);
+        i += 2;
+      }else
+      if( strcmp(z,"pagesize")==0 ){
+        if( i>=argc-1 ) abendError("missing argument on %s", argv[i]);
+        pageSize = integerValue(argv[++i]);
+      }else
+      if( strcmp(z,"pcache")==0 ){
+        if( i>=argc-2 ) abendError("missing arguments on %s", argv[i]);
+        nPCache = integerValue(argv[i+1]);
+        szPCache = integerValue(argv[i+2]);
+        i += 2;
+      }else
+      if( strcmp(z,"scratch")==0 ){
+        if( i>=argc-2 ) abendError("missing arguments on %s", argv[i]);
+        nScratch = integerValue(argv[i+1]);
+        szScratch = integerValue(argv[i+2]);
+        i += 2;
+      }else
+      if( strcmp(z,"utf16le")==0 ){
+        zEncoding = "utf16le";
+      }else
+      if( strcmp(z,"utf16be")==0 ){
+        zEncoding = "utf16be";
+      }else
       {
         abendError("unknown option: %s", argv[i]);
       }
@@ -274,6 +406,33 @@ int main(int argc, char **argv){
     }
   }
   sqlite3_config(SQLITE_CONFIG_LOG, shellLog, 0);
+  if( nHeap>0 ){
+    pHeap = malloc( nHeap );
+    if( pHeap==0 ) fatalError("cannot allocate %d-byte heap\n", nHeap);
+    rc = sqlite3_config(SQLITE_CONFIG_HEAP, pHeap, nHeap, mnHeap);
+    if( rc ) abendError("heap configuration failed: %d\n", rc);
+  }
+  if( nLook>0 ){
+    sqlite3_config(SQLITE_CONFIG_LOOKASIDE, 0, 0);
+    if( szLook>0 ){
+      pLook = malloc( nLook*szLook );
+      if( pLook==0 ) fatalError("out of memory");
+    }
+  }
+  if( nScratch>0 && szScratch>0 ){
+    pScratch = malloc( nScratch*(sqlite3_int64)szScratch );
+    if( pScratch==0 ) fatalError("cannot allocate %lld-byte scratch",
+                                 nScratch*(sqlite3_int64)szScratch);
+    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, pScratch, szScratch, nScratch);
+    if( rc ) abendError("scratch configuration failed: %d\n", rc);
+  }
+  if( nPCache>0 && szPCache>0 ){
+    pPCache = malloc( nPCache*(sqlite3_int64)szPCache );
+    if( pPCache==0 ) fatalError("cannot allocate %lld-byte pcache",
+                                 nPCache*(sqlite3_int64)szPCache);
+    rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, pPCache, szPCache, nPCache);
+    if( rc ) abendError("pcache configuration failed: %d", rc);
+  }
   while( !feof(in) ){
     nAlloc += nAlloc+1000;
     zIn = realloc(zIn, nAlloc);
@@ -308,6 +467,10 @@ int main(int argc, char **argv){
     if( rc!=SQLITE_OK ){
       abendError("Unable to open the in-memory database");
     }
+    if( pLook ){
+      rc = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE, pLook, szLook, nLook);
+      if( rc!=SQLITE_OK ) abendError("lookaside configuration filed: %d", rc);
+    }
     if( zInitDb ){
       sqlite3_backup *pBackup;
       pBackup = sqlite3_backup_init(db, "main", dbInit, "main");
@@ -322,7 +485,9 @@ int main(int argc, char **argv){
     sqlite3_create_function(db, "eval", 1, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
     sqlite3_create_function(db, "eval", 2, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
     sqlite3_limit(db, SQLITE_LIMIT_LENGTH, 1000000);
-
+    if( zEncoding ) sqlexec(db, "PRAGMA encoding=%s", zEncoding);
+    if( pageSize ) sqlexec(db, "PRAGMA pagesize=%d", pageSize);
+    if( doAutovac ) sqlexec(db, "PRAGMA auto_vacuum=FULL");
     cSaved = zIn[iNext];
     zIn[iNext] = 0;
     printf("INPUT (offset: %d, size: %d): [%s]\n",
@@ -344,5 +509,9 @@ int main(int argc, char **argv){
     }
   }
   free(zIn);
+  free(pHeap);
+  free(pLook);
+  free(pScratch);
+  free(pPCache);
   return 0;
 }