From: drh Date: Wed, 10 Apr 2019 12:02:55 +0000 (+0000) Subject: Change the name of some internal testing interfaces to avoid a name X-Git-Tag: version-3.28.0~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e1a574875a5cb3021adb2327f2919b85f186ede;p=thirdparty%2Fsqlite.git Change the name of some internal testing interfaces to avoid a name conflict in AIX. FossilOrigin-Name: c1cae7e7f0a612508c8f82b334d9ebc423f443e99b13092d52e26b348c7cbc5e --- diff --git a/manifest b/manifest index c351818373..101f34f95f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\splace\sarbitrary\srestrictions\son\sthe\slength\sof\sthe\sfailure\smessage\nfor\sa\suniqueness\sconstraint. -D 2019-04-10T00:58:07.720 +C Change\sthe\sname\sof\ssome\sinternal\stesting\sinterfaces\sto\savoid\sa\sname\nconflict\sin\sAIX. +D 2019-04-10T12:02:55.771 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -530,7 +530,7 @@ F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd35194 F src/test1.c cfb303eeddd3670409af6b58d2ddb928b8e9e70822d681d3df88dfaabb7bea6a F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 -F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6 +F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d F src/test6.c e8d839fbc552ce044bec8234561a2d5b8819b48e29548ad0ba400471697946a8 F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010 @@ -1814,7 +1814,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 4c77fbbe5d54248821161d708d0631fab65659bef31f95a61af681d4639f5918 -R be4da9f6b49c561e806f224dfc7c7be5 +P 037da798fa5510ba7c776831ebcd683a85dca28e25bc657ff17bb2b08c3d406e +R d3a0726ffa5ad97d38dc721c8e3b08e3 U drh -Z 357c0e2f7d4294e9e0424d2062f7ff11 +Z 4a3cd4127df4ce2d38bbe8e11916b371 diff --git a/manifest.uuid b/manifest.uuid index 80ce0b5608..6ad329814a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -037da798fa5510ba7c776831ebcd683a85dca28e25bc657ff17bb2b08c3d406e \ No newline at end of file +c1cae7e7f0a612508c8f82b334d9ebc423f443e99b13092d52e26b348c7cbc5e \ No newline at end of file diff --git a/src/test4.c b/src/test4.c index c5b5ec12cc..2ef5fe6928 100644 --- a/src/test4.c +++ b/src/test4.c @@ -64,7 +64,7 @@ static Thread threadset[N_THREAD]; /* ** The main loop for a thread. Threads use busy waiting. */ -static void *thread_main(void *pArg){ +static void *test_thread_main(void *pArg){ Thread *p = (Thread*)pArg; if( p->db ){ sqlite3_close(p->db); @@ -151,7 +151,7 @@ static int SQLITE_TCLAPI tcl_thread_create( threadset[i].zFilename = sqlite3_mprintf("%s", argv[2]); threadset[i].opnum = 1; threadset[i].completed = 0; - rc = pthread_create(&x, 0, thread_main, &threadset[i]); + rc = pthread_create(&x, 0, test_thread_main, &threadset[i]); if( rc ){ Tcl_AppendResult(interp, "failed to create the thread", 0); sqlite3_free(threadset[i].zFilename); @@ -165,7 +165,7 @@ static int SQLITE_TCLAPI tcl_thread_create( /* ** Wait for a thread to reach its idle state. */ -static void thread_wait(Thread *p){ +static void test_thread_wait(Thread *p){ while( p->opnum>p->completed ) sched_yield(); } @@ -193,18 +193,18 @@ static int SQLITE_TCLAPI tcl_thread_wait( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); return TCL_OK; } /* ** Stop a thread. */ -static void stop_thread(Thread *p){ - thread_wait(p); +static void test_stop_thread(Thread *p){ + test_thread_wait(p); p->xOp = 0; p->opnum++; - thread_wait(p); + test_thread_wait(p); sqlite3_free(p->zArg); p->zArg = 0; sqlite3_free(p->zFilename); @@ -233,7 +233,7 @@ static int SQLITE_TCLAPI tcl_thread_halt( } if( argv[1][0]=='*' && argv[1][1]==0 ){ for(i=0; i=threadset[i].argc ){ Tcl_AppendResult(interp, "column number out of range", 0); return TCL_ERROR; @@ -342,7 +342,7 @@ static int SQLITE_TCLAPI tcl_thread_colname( return TCL_ERROR; } if( Tcl_GetInt(interp, argv[2], &n) ) return TCL_ERROR; - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); if( n<0 || n>=threadset[i].argc ){ Tcl_AppendResult(interp, "column number out of range", 0); return TCL_ERROR; @@ -377,7 +377,7 @@ static int SQLITE_TCLAPI tcl_thread_result( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); zName = sqlite3ErrName(threadset[i].rc); Tcl_AppendResult(interp, zName, 0); return TCL_OK; @@ -408,7 +408,7 @@ static int SQLITE_TCLAPI tcl_thread_error( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); Tcl_AppendResult(interp, threadset[i].zErr, 0); return TCL_OK; } @@ -452,7 +452,7 @@ static int SQLITE_TCLAPI tcl_thread_compile( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); threadset[i].xOp = do_compile; sqlite3_free(threadset[i].zArg); threadset[i].zArg = sqlite3_mprintf("%s", argv[2]); @@ -505,7 +505,7 @@ static int SQLITE_TCLAPI tcl_thread_step( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); threadset[i].xOp = do_step; threadset[i].opnum++; return TCL_OK; @@ -547,7 +547,7 @@ static int SQLITE_TCLAPI tcl_thread_finalize( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); threadset[i].xOp = do_finalize; sqlite3_free(threadset[i].zArg); threadset[i].zArg = 0; @@ -579,14 +579,14 @@ static int SQLITE_TCLAPI tcl_thread_swap( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); j = parse_thread_id(interp, argv[2]); if( j<0 ) return TCL_ERROR; if( !threadset[j].busy ){ Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[j]); + test_thread_wait(&threadset[j]); temp = threadset[i].db; threadset[i].db = threadset[j].db; threadset[j].db = temp; @@ -620,7 +620,7 @@ static int SQLITE_TCLAPI tcl_thread_db_get( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); sqlite3TestMakePointerStr(interp, zBuf, threadset[i].db); threadset[i].db = 0; Tcl_AppendResult(interp, zBuf, (char*)0); @@ -651,7 +651,7 @@ static int SQLITE_TCLAPI tcl_thread_db_put( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); assert( !threadset[i].db ); threadset[i].db = (sqlite3*)sqlite3TestTextToPtr(argv[2]); return TCL_OK; @@ -683,7 +683,7 @@ static int SQLITE_TCLAPI tcl_thread_stmt_get( Tcl_AppendResult(interp, "no such thread", 0); return TCL_ERROR; } - thread_wait(&threadset[i]); + test_thread_wait(&threadset[i]); sqlite3TestMakePointerStr(interp, zBuf, threadset[i].pStmt); threadset[i].pStmt = 0; Tcl_AppendResult(interp, zBuf, (char*)0);