root
/
cesium-native
mirror of https://github.com/CesiumGS/cesium-native.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #606 from CesiumGS/tracing-fixes 

Fix compile error when tracing is enabled, disable trace tracks for raster overlays
This commit is contained in:
Joseph Kaile 2023-03-27 14:38:53 -04:00 committed by GitHub
parent 5daed12641 420864545b
commit 6f7ff95ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cesium3DTilesSelection/src/RasterOverlayCollection.cpp
View File

@ -47,7 +47,7 @@ RasterOverlayCollection::~RasterOverlayCollection() noexcept {
void RasterOverlayCollection::add(
const CesiumUtility::IntrusivePointer<RasterOverlay>& pOverlay) {
CESIUM_TRACE_USE_TRACK_SET(this->_loadingSlots);
// CESIUM_TRACE_USE_TRACK_SET(this->_loadingSlots);
if (!this->_pOverlays)
this->_pOverlays = new OverlayList();
@ -64,7 +64,7 @@ void RasterOverlayCollection::add(
pList->tileProviders.emplace_back(pPlaceholder);
pList->placeholders.emplace_back(pPlaceholder);
CESIUM_TRACE_BEGIN_IN_TRACK("createTileProvider");
// CESIUM_TRACE_BEGIN_IN_TRACK("createTileProvider");
CesiumAsync::Future<RasterOverlay::CreateTileProviderResult> future =
pOverlay->createTileProvider(
@ -131,7 +131,7 @@ void RasterOverlayCollection::add(
}
}
CESIUM_TRACE_END_IN_TRACK("createTileProvider");
// CESIUM_TRACE_END_IN_TRACK("createTileProvider");
});
}

2
Cesium3DTilesSelection/src/RasterOverlayTileProvider.cpp
View File

@ -305,7 +305,7 @@ void RasterOverlayTileProvider::doLoad(
return;
}
CESIUM_TRACE_USE_TRACK_SET(this->_loadingSlots);
// CESIUM_TRACE_USE_TRACK_SET(this->_loadingSlots);
// Don't let this tile be destroyed while it's loading.
tile.setState(RasterOverlayTile::LoadState::Loading);

3
CesiumUtility/include/CesiumUtility/Tracing.h
View File

@ -276,6 +276,9 @@ public:
int64_t getTracingID(size_t trackIndex) noexcept;
TrackSet(TrackSet&& rhs) noexcept;
TrackSet& operator=(TrackSet&& rhs) noexcept;
private:
struct Track {
Track(int64_t id_, bool inUse_)

14
CesiumUtility/src/Tracing.cpp
View File

@ -212,6 +212,20 @@ int64_t TrackSet::getTracingID(size_t trackIndex) noexcept {
return this->tracks[trackIndex].id;
}
TrackSet::TrackSet(TrackSet&& rhs) noexcept : name(), tracks(), mutex() {
std::scoped_lock lock(rhs.mutex);
name = rhs.name;
tracks = rhs.tracks;
}
TrackSet& TrackSet::operator=(TrackSet&& rhs) noexcept {
std::scoped_lock lock(rhs.mutex);
std::scoped_lock lock2(this->mutex);
name = std::move(rhs.name);
tracks = std::move(rhs.tracks);
return *this;
}
LambdaCaptureTrack::LambdaCaptureTrack() : pSet(nullptr), index(0) {
const TrackReference* pTrack = TrackReference::current();
if (pTrack) {