For the multi-process tester on Win32, make use of the GetCurrentProcessId API.

FossilOrigin-Name: f1b524b9d9ea3db96d54ac55c39f15e6879085bd

diff --git a/manifest b/manifest
index 8623e2f65f96e07b4190d849402a1762d813fb4c..347b207be7bf951a85325952c88127451a2ec9e7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sxCheckReservedLock()\smethod\son\sthe\swindows\sVFS\sso\sthat\sit\scannot\nreturn\sa\sfalse\spositive\swhen\stwo\sor\smore\sprocesses\suse\sit\sat\sthe\ssame\stime\non\sthe\ssame\sfile.\s\sTicket\s[7ff3120e4fa54abb55]
-D 2013-04-11T18:28:55.139
+C For\sthe\smulti-process\stester\son\sWin32,\smake\suse\sof\sthe\sGetCurrentProcessId\sAPI.
+D 2013-04-11T21:13:10.779
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -114,7 +114,7 @@ F mptest/config01.test 3f4ddeb152a4f83872f0fa7fcb48d9fd609893da
 F mptest/config02.test 962913ed2b537d60de4126db7fe54716865cdd22
 F mptest/crash01.test a5f31998ed48de8267d6620e8af107ec148e5f12
 F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
-F mptest/mptest.c 1a8ca3d21e285d38f3ee06d708e634dda3f05bed
+F mptest/mptest.c 53066ffe4ae6f0c4de451cc77985b88d0fee2aec
 F mptest/multiwrite01.test 81fbc17657964889b60750bd7bbb1deffe8f4d42
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@ -1050,7 +1050,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 663f04bd48bc6f302230a22bd22b82bde2353943
-R bd2e6ca88b98f09bd2a36a3fcc06c9f0
-U drh
-Z 2e31b5ec3b1e364139cb9a99bd138f76
+P dd3510bb20ade173c81c9874c05466011c8a249d
+R 69eb3039bde7025dc2da94e69ac2fbdc
+U mistachkin
+Z 5b9c93ebe8aafa80e045145422e5fe06

diff --git a/manifest.uuid b/manifest.uuid
index 8f27dd8da92d0baa0dea82de643c71b332706323..0a9b5274e15562d11b8c7a8ef784b3c21fba3568 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd3510bb20ade173c81c9874c05466011c8a249d
\ No newline at end of file
+f1b524b9d9ea3db96d54ac55c39f15e6879085bd
\ No newline at end of file

diff --git a/mptest/mptest.c b/mptest/mptest.c
index 210ac6fa7b40d32adf133723b29cc1ec85891072..33f4a3fa715e15cd284983910127e4caa86328c1 100644 (file)
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@ -38,11 +38,8 @@
 #if defined(_WIN32)
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-# include <process.h>
-# define GETPID _getpid
 #else
 # include <unistd.h>
-# define GETPID getpid
 #endif
 #include <stdlib.h>
 #include <string.h>
@@ -52,8 +49,10 @@
 /* The suffix to append to the child command lines, if any */
 #if defined(_WIN32)
 # define CMDLINE_SUFFIX ""
+# define GETPID (int)GetCurrentProcessId
 #else
 # define CMDLINE_SUFFIX "&"
+# define GETPID getpid
 #endif
 
 /* Mark a parameter as unused to suppress compiler warnings */