From 4a9ff91852c8bc23a7a1157d05a789b1a1211dd4 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 9 Nov 2017 17:29:04 +0000 Subject: [PATCH] Make it possible to use OSTRACE for multi-process testing. FossilOrigin-Name: 0a7d416c4c43632725dc89cda8667cd9726b5152ee4692e4d0c9e2031e60cfb4 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/printf.c | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index dbc8286837..d11e831d0c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Initial\swork\son\sporting\sthe\schanges\son\sthis\sbranch\sto\sWin32. -D 2017-11-09T16:30:55.245 +C Make\sit\spossible\sto\suse\sOSTRACE\sfor\smulti-process\stesting. +D 2017-11-09T17:29:04.731 F Makefile.in 5bae3f2f3d42f2ad52b141562d74872c97ac0fca6c54953c91bb150a0e6427a8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 3a5cb477ec3ce5274663b693164e349db63348667cd45bad78cc13d580b691e2 @@ -459,7 +459,7 @@ F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880 F src/pragma.c d04725ac25387d9638919e197fb009f378e13af7bf899516979e54b3164e3602 F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324 F src/prepare.c 7cf451f903ad92a14e22de415a13e7a7d30f1bd23b3d21eeb0dc7264723244c5 -F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c +F src/printf.c 9506b4b96e59c0467047155f09015750cb2878aeda3d39e5610c1192ddc3c41c F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 5a461643f294ec510ca615b67256fc3861e4c8eff5f29e5940491e70553b1955 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac @@ -1669,7 +1669,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 033ee92bf4d5dc57f5cb8fd02d1154ae06f2d3261d214e7191a82c70c8ffebf7 -R a3370fa9345068426fa8edd8924927fc +P 3738bfd0c0eadb10eea58954af5052cb6ce164059f3aacfe65d7da6a400c63c7 +R b588bb75e731a71d38f9b889268c4e35 U mistachkin -Z fbbc6e55aa870fcd83aef8acf0e01375 +Z 3f860c7c58efb09a7e9d6ae32c9bc1c6 diff --git a/manifest.uuid b/manifest.uuid index f5c23f13f2..866cdfe91f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3738bfd0c0eadb10eea58954af5052cb6ce164059f3aacfe65d7da6a400c63c7 \ No newline at end of file +0a7d416c4c43632725dc89cda8667cd9726b5152ee4692e4d0c9e2031e60cfb4 \ No newline at end of file diff --git a/src/printf.c b/src/printf.c index 9427844e09..ca8d26e4f9 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1092,8 +1092,15 @@ void sqlite3DebugPrintf(const char *zFormat, ...){ sqlite3VXPrintf(&acc, zFormat, ap); va_end(ap); sqlite3StrAccumFinish(&acc); +#ifdef SQLITE_OS_TRACE_PROC + { + extern void SQLITE_OS_TRACE_PROC(const char *zBuf, int nBuf); + SQLITE_OS_TRACE_PROC(zBuf, sizeof(zBuf)); + } +#else fprintf(stdout,"%s", zBuf); fflush(stdout); +#endif } #endif