]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the jni-threading branch into trunk, eliminating the JNI API's prior threading...
authorstephan <stephan@noemail.net>
Thu, 24 Aug 2023 14:49:29 +0000 (14:49 +0000)
committerstephan <stephan@noemail.net>
Thu, 24 Aug 2023 14:49:29 +0000 (14:49 +0000)
FossilOrigin-Name: 3739c8aa7080d8e1044ca51ab7b699b50da4d29620b35acfcea2745059b65bac

1  2 
ext/jni/GNUmakefile
manifest
manifest.uuid

index 1be4c0443949ba8ec516b6cd6e3143a0ecbabad0,6b32c40a824459f6d024ceca8cb97d92bac94d14..e3dfb53c1d3d86ee0c53234437980390129b81d5
@@@ -226,12 -226,15 +226,16 @@@ $(sqlite3-jni.dll): $(dir.bld.c) $(sqli
                        $(sqlite3-jni.c) -shared -o $@
  all: $(sqlite3-jni.dll)
  
--.PHONY: test
- test.flags ?= -v
- test: $(SQLite3Jni.class) $(sqlite3-jni.dll)
-       $(bin.java) -ea -Djava.library.path=$(dir.bld.c) \
-               $(java.flags) -cp $(classpath) \
-               org.sqlite.jni.Tester1 $(if $(test.flags),-- $(test.flags),)
++.PHONY: test test-one
+ test.flags ?=
+ test.main.flags = -ea -Djava.library.path=$(dir.bld.c) \
+                   $(java.flags) -cp $(classpath) \
+                   org.sqlite.jni.Tester1
 -test: $(SQLite3Jni.class) $(sqlite3-jni.dll)
++test-one: $(SQLite3Jni.class) $(sqlite3-jni.dll)
+       $(bin.java) $(test.main.flags) $(test.flags)
 -      @echo "Again in multi-threaded mode:"
++test: test-one
++      @echo "Again in multi-threaded mode:";
+       $(bin.java) $(test.main.flags) -t 5 -r 20 -shuffle $(test.flags)
  
  tester.scripts := $(sort $(wildcard $(dir.src)/tests/*.test))
  tester.flags ?= # --verbose
diff --cc manifest
index 1df7b6f2ee9bde18bdb522e61edbecbb2f018b31,681eca27b33cc0bb463d63519fa91f9b9eb5ea35..b03cdd859291b12a271468462ac321fab6542744
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sinto\strunk\simprovements\smade\sto\sthe\swasm\sAPIs\swhich\swere\stoo\slate\sfor\s3.43.
- D 2023-08-24T14:43:30.216
 -C Correct\sJNI\slayer's\smisuse\sof\san\ssqlite3-internal\serror-reporting\sAPI\s(no\smutex\sheld).\sStyle\scleanups.\sEliminate\slookups\sof\sper-thread\sstate\sby\sapproximately\s85%\sacross\sthe\stest\ssuite.
 -D 2023-08-24T14:31:36.028
++C Merge\sthe\sjni-threading\sbranch\sinto\strunk,\seliminating\sthe\sJNI\sAPI's\sprior\sthreading\slimitations.
++D 2023-08-24T14:49:29.051
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -232,13 -232,13 +232,13 @@@ F ext/fts5/tool/showfts5.tcl d54da0e067
  F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
  F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
  F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
- F ext/jni/GNUmakefile 3deba6bc0bf37c1ee5f15d1ff3c3512ae2f3cf44a2b8ae7b4af92690514b0cb4
- F ext/jni/README.md 5c60e4580aa5c94ff74d7bef1fb6231e578f7764e831a07b5981b6ab62b35560
- F ext/jni/jar-dist.make 93da95f8fe01ef22fccacc27f2e805938058e91e8c72c0532558d3a812a42e74
- F ext/jni/src/c/sqlite3-jni.c bea6b8691a5fa3a8626a771757bb261208d3c5fc6598266d3b0ee23d88e35632
- F ext/jni/src/c/sqlite3-jni.h 28565de9efc971195c684095ba0d184b90401290698c987f7ea3f54e47ff4f2f
 -F ext/jni/GNUmakefile 0a823c56f081294e7797dae303380ac989ebaa801bba970968342b7358f07aed
++F ext/jni/GNUmakefile 2e17aae8debf0b0ee12010500eae7bd9557f8ad5554f0161c39a41f229e84e3e
+ F ext/jni/README.md 64bf1da0d562d051207ca1c5cfa52e8b7a69120533cc034a3da7670ef920cbef
+ F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
+ F ext/jni/src/c/sqlite3-jni.c d7d6d420f2a13d55828cee19ba17a37c4244532dafbc5822582d7fd52ae2aaf0
+ F ext/jni/src/c/sqlite3-jni.h cc24d6742b29a52338ffd3b47caf923facb8ae77f9c2fc9c2de82673bf339ea2
  F ext/jni/src/org/sqlite/jni/Authorizer.java 1308988f7f40579ea0e4deeaec3c6be971630566bd021c31367fe3f5140db892
- F ext/jni/src/org/sqlite/jni/AutoExtension.java 18e83f6f463e306df60b2dceb65247d32af1f78af4bbbae9155411a8c6cdb093
+ F ext/jni/src/org/sqlite/jni/AutoExtension.java bcc1849b2fccbe5e2d7ac9e9ac7f8d05a6d7088a8fedbaad90e39569745a61e6
  F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c
  F ext/jni/src/org/sqlite/jni/Collation.java 8dffbb00938007ad0967b2ab424d3c908413af1bbd3d212b9c9899910f1218d1
  F ext/jni/src/org/sqlite/jni/CollationNeeded.java ad67843b6dd1c06b6b0a1dc72887b7c48e2a98042fcf6cacf14d42444037eab8
@@@ -2092,9 -2094,8 +2094,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0f80b798b3f4b81a7bb4233c58294edd0f1156f36b6ecf5ab8e83631d468778c b8f6a50a4bf9478324f0272d79f2fe6992a49b753e79e39a268c6afb261bb01e
- R 7ae5b52e7df2292254903c2a58e5680f
- T +closed b8f6a50a4bf9478324f0272d79f2fe6992a49b753e79e39a268c6afb261bb01e Closed\sby\sintegrate-merge.
 -P d19a431facbde6a6b960664674753ee85d2c051a76109ce7db0b079c65fbdea0
 -R a3460d6a3bf6ffdc6985db3e6bc764fc
++P ac9da5c79a4f56d25202d50974e16e2a463d77c99b1907aee2605d5a3e50a565 1f46ba8d3bc61af771c1e33d09ad25f0da4fc4f915f7a9f6223ebfd99526d81d
++R 77949ce12a43210a6d0344be95da4143
++T +closed 1f46ba8d3bc61af771c1e33d09ad25f0da4fc4f915f7a9f6223ebfd99526d81d Closed\sby\sintegrate-merge.
  U stephan
- Z 43037d70eaecfc3116c1946ba3ee4fe8
 -Z 4bd864e1476ea863a52783451fa010a4
++Z 8355fada3860b53acd7e17e529df543a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 11b51edd1d3e4f8b6b7cd98ddbd65d97a16ece50,bc1f81d857473111b263c3d38706428a5d585a2e..220fc74d643a6df3c2330d661396daa5158e1a2b
@@@ -1,1 -1,1 +1,1 @@@
- ac9da5c79a4f56d25202d50974e16e2a463d77c99b1907aee2605d5a3e50a565
 -1f46ba8d3bc61af771c1e33d09ad25f0da4fc4f915f7a9f6223ebfd99526d81d
++3739c8aa7080d8e1044ca51ab7b699b50da4d29620b35acfcea2745059b65bac