[mapguide-commits] r8194 - in sandbox/jng/tiling/Server/src: PostBuild UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jun 10 03:08:48 PDT 2014
Author: jng
Date: 2014-06-10 03:08:48 -0700 (Tue, 10 Jun 2014)
New Revision: 8194
Modified:
sandbox/jng/tiling/Server/src/PostBuild/PostBuild.mak
sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.cpp
sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.h
Log:
- Add test for exercising multithreaded XYZ GetTile
- Fix tabs in PostBuild.mak
Modified: sandbox/jng/tiling/Server/src/PostBuild/PostBuild.mak
===================================================================
--- sandbox/jng/tiling/Server/src/PostBuild/PostBuild.mak 2014-06-10 08:16:58 UTC (rev 8193)
+++ sandbox/jng/tiling/Server/src/PostBuild/PostBuild.mak 2014-06-10 10:08:48 UTC (rev 8194)
@@ -164,9 +164,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -436,9 +436,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -708,9 +708,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -980,9 +980,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -1125,9 +1125,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -1220,7 +1220,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
del /F ..\..\bin\debug\*.ilk
@@ -1265,9 +1265,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -1360,7 +1360,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
del /F ..\..\bin\debug64\*.ilk
@@ -1405,9 +1405,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -1543,9 +1543,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -1638,7 +1638,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
@@ -1808,9 +1808,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -2073,9 +2073,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -2338,9 +2338,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -2603,9 +2603,9 @@
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
+ ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
+ ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
+ ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
..\..\bin\UnitTestFiles\UT_Parcels.fs \
..\..\bin\UnitTestFiles\UT_Parcels.ldf \
@@ -2741,9 +2741,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -2829,7 +2829,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
del /F ..\..\bin\debug(v100)\*.ilk
@@ -2874,9 +2874,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -2962,7 +2962,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
del /F ..\..\bin\debug(v100)64\*.ilk
@@ -3007,9 +3007,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -3138,9 +3138,9 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
@@ -3226,7 +3226,7 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
@@ -3752,4 +3752,4 @@
..\..\bin\UnitTestFiles\JoinTest.sqlite : "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite"
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" ..\..\bin\UnitTestFiles\
\ No newline at end of file
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" ..\..\bin\UnitTestFiles\
Modified: sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.cpp
===================================================================
--- sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.cpp 2014-06-10 08:16:58 UTC (rev 8193)
+++ sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.cpp 2014-06-10 10:08:48 UTC (rev 8194)
@@ -27,6 +27,10 @@
// determines the number of requests to make, as a factor of the number of tiles
#define REQUEST_FACTOR 20
+// determines the interval of requests made for the ACE thread manager to wait for the entire thread group to complete
+// (to avoid deadlock issues on Linux)
+#define REQUEST_WAIT_INTERVAL 25
+
// define thread group for tiling tests
#define THREAD_GROUP 65535
@@ -445,7 +449,7 @@
break;
// under Linux we get a deadlock if we don't call this every once in a while
- if (nRequest % 25 == 0)
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
manager->wait_grp(THREAD_GROUP);
else
{
@@ -637,7 +641,7 @@
break;
// under Linux we get a deadlock if we don't call this every once in a while
- if (nRequest % 25 == 0)
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
manager->wait_grp(THREAD_GROUP);
else
{
@@ -831,7 +835,7 @@
break;
// under Linux we get a deadlock if we don't call this every once in a while
- if (nRequest % 25 == 0)
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
manager->wait_grp(THREAD_GROUP);
else
{
@@ -894,7 +898,7 @@
break;
// under Linux we get a deadlock if we don't call this every once in a while
- if (nRequest % 25 == 0)
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
manager->wait_grp(THREAD_GROUP);
else
{
@@ -1029,7 +1033,7 @@
break;
// under Linux we get a deadlock if we don't call this every once in a while
- if (nRequest % 25 == 0)
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
manager->wait_grp(THREAD_GROUP);
else
{
@@ -1093,7 +1097,195 @@
}
}
+// the method which gets executed by the ACE worker thread
+ACE_THR_FUNC_RETURN GetTileXYZWorker(void* param)
+{
+ // get the data for this thread
+ TileThreadData* threadData = (TileThreadData*)param;
+ INT32 threadId = threadData->threadId;
+ INT32 tileRow = threadData->tileRow;
+ INT32 tileCol = threadData->tileCol;
+ INT32 tileScale = threadData->tileScale;
+ bool saveTile = threadData->saveTile;
+ Ptr<MgResourceIdentifier> tsId = new MgResourceIdentifier(threadData->tileSetId);
+ #ifdef _DEBUG
+ printf("> thread %d started, tile %d,%d\n", threadId, tileRow, tileCol);
+ #endif
+ try
+ {
+ // set user info
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ // get the tile service instance
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+ Ptr<MgTileService> svcTile = dynamic_cast<MgTileService*>(
+ serviceManager->RequestService(MgServiceType::TileService));
+ assert(svcTile != NULL);
+
+ // get the tile
+ Ptr<MgByteReader> img = svcTile->GetTile(tsId, L"BaseLayers", tileCol, tileRow, tileScale);
+ CHECKNULL((MgByteReader*)img, L"GetTileXYZWorker");
+
+ // save the image to a file if necessary
+ if (saveTile)
+ {
+ wchar_t imgName[PATH_LEN] = { 0 };
+ swprintf(imgName, PATH_LEN, L"./temp_tiles/tile%d_%d.png", tileRow, tileCol);
+ (MgByteSink(img)).ToFile(imgName);
+ }
+
+ // clear the user info to prevent leaks
+ MgUserInformation::SetCurrentUserInfo(NULL);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+
+ #ifdef _DEBUG
+// printf("> thread %d done\n", threadId);
+ #endif
+
+ threadData->done = true;
+ return 0;
+}
+
+
+void TestTileService::TestCase_GetTileXYZ()
+{
+ // specify the number of threads to use
+ const INT32 numThreads = MG_TEST_THREADS;
+ TileThreadData threadData[numThreads];
+
+ // define the range of tiles to get
+ INT32 tileRowMin = 33587;
+ INT32 tileRowMax = 33601;
+ INT32 tileColMin = 47766;
+ INT32 tileColMax = 47784;
+
+ try
+ {
+ // need a thread manager
+ ACE_Thread_Manager* manager = ACE_Thread_Manager::instance();
+
+ // make the runtime map
+ Ptr<MgMap> map = CreateMap();
+
+ // set up the tile indices
+ INT32 numTileRows = tileRowMax - tileRowMin + 1;
+ INT32 numTileCols = tileColMax - tileColMin + 1;
+ INT32 numTiles = numTileRows * numTileCols;
+
+ INT32* tileRows = new INT32[numTiles];
+ INT32* tileCols = new INT32[numTiles];
+
+ INT32 nRequest = 0;
+ for (INT32 tileRow = tileRowMin; tileRow <= tileRowMax; ++tileRow)
+ {
+ for (INT32 tileCol = tileColMin; tileCol <= tileColMax; ++tileCol)
+ {
+ tileRows[nRequest] = tileRow;
+ tileCols[nRequest] = tileCol;
+ nRequest++;
+ }
+ }
+
+ // initialize the thread data
+ for (INT32 i=0; i<numThreads; i++)
+ {
+ threadData[i].threadId = i;
+ threadData[i].done = true;
+ threadData[i].saveTile = false;
+ threadData[i].tileSetId = L"Library://UnitTests/TileSets/XYZ.TileSetDefinition";
+ threadData[i].tileRow = 0;
+ threadData[i].tileCol = 0;
+ threadData[i].tileScale = 17; //z
+ }
+
+ // execute the requests to randomly access the tiles
+ #ifdef _DEBUG
+ printf("\n");
+ #endif
+ nRequest = 0;
+ for (;;)
+ {
+ INT32 dc = 0;
+ for (INT32 i=0; i<numThreads; i++)
+ {
+ // check if the thread is available
+ if (threadData[i].done)
+ {
+ // if we're not yet done then give the thread a new request
+ if (nRequest < REQUEST_FACTOR*numTiles)
+ {
+ // pick a random request to execute...
+ INT32 nTile = Rand(numTiles);
+
+ // ... but make every REQUEST_FACTOR-th tile non-random to
+ // ensure we get each tile at least once
+ if (nRequest % REQUEST_FACTOR == 0)
+ nTile = nRequest / REQUEST_FACTOR;
+
+ threadData[i].done = false;
+ threadData[i].saveTile = (nRequest % REQUEST_FACTOR == 0);
+ threadData[i].tileRow = tileRows[nTile];
+ threadData[i].tileCol = tileCols[nTile];
+
+ // spawn a new thread using a specific group id
+ int thid = manager->spawn(ACE_THR_FUNC(GetTileXYZWorker), &threadData[i], 0, NULL, NULL, 0, THREAD_GROUP);
+ nRequest++;
+ }
+
+ // keep a tally of all the done threads
+ if (threadData[i].done)
+ ++dc;
+ }
+ }
+
+ // move on if all threads are done
+ if (dc == numThreads)
+ break;
+
+ // under Linux we get a deadlock if we don't call this every once in a while
+ if (nRequest % REQUEST_WAIT_INTERVAL == 0)
+ manager->wait_grp(THREAD_GROUP);
+ else
+ {
+ // pause briefly (10ms) before checking again
+ ACE_Time_Value t(0, 10000);
+ ACE_OS::sleep(t);
+ }
+ }
+
+ // make sure all threads in the group have completed
+ manager->wait_grp(THREAD_GROUP);
+
+ // done with the tile indices
+ delete [] tileRows;
+ delete [] tileCols;
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+
void TestTileService::TestCase_ClearCacheLinked()
{
try
Modified: sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.h
===================================================================
--- sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.h 2014-06-10 08:16:58 UTC (rev 8193)
+++ sandbox/jng/tiling/Server/src/UnitTesting/TestTileService.h 2014-06-10 10:08:48 UTC (rev 8194)
@@ -36,6 +36,7 @@
CPPUNIT_TEST(TestCase_GetSetTile);
CPPUNIT_TEST(TestCase_ClearCache);
CPPUNIT_TEST(TestCase_GetTileLinked);
+ CPPUNIT_TEST(TestCase_GetTileXYZ);
CPPUNIT_TEST(TestCase_ClearCacheLinked);
CPPUNIT_TEST(TestEnd); // This must be the very last unit test
@@ -59,6 +60,7 @@
void TestCase_GetTile();
void TestCase_SetTile();
void TestCase_GetSetTile();
+ void TestCase_GetTileXYZ();
void TestCase_ClearCache();
void TestCase_GetTileLinked();
void TestCase_ClearCacheLinked();
More information about the mapguide-commits
mailing list