Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-09 15:17:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch various status to use thread safe atomics

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-11-12 13:09:51 -08:00
parent da8270d50b
commit 66a2b38f50
7 changed files with 66 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -112,12 +112,12 @@ bool OctreeSendThread::process() {
return isStillRunning(); // keep running till they terminate us return isStillRunning(); // keep running till they terminate us
} }
quint64 OctreeSendThread::_usleepTime = 0; AtomicUIntStat OctreeSendThread::_usleepTime = 0;
quint64 OctreeSendThread::_usleepCalls = 0; AtomicUIntStat OctreeSendThread::_usleepCalls = 0;
quint64 OctreeSendThread::_totalBytes = 0; AtomicUIntStat OctreeSendThread::_totalBytes = 0;
quint64 OctreeSendThread::_totalWastedBytes = 0; AtomicUIntStat OctreeSendThread::_totalWastedBytes = 0;
quint64 OctreeSendThread::_totalPackets = 0; AtomicUIntStat OctreeSendThread::_totalPackets = 0;
int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent) { int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent) {
OctreeServer::didHandlePacketSend(this); OctreeServer::didHandlePacketSend(this);

14
assignment-client/src/octree/OctreeSendThread.h
View file

@ -14,6 +14,8 @@
#ifndef hifi_OctreeSendThread_h #ifndef hifi_OctreeSendThread_h
#define hifi_OctreeSendThread_h #define hifi_OctreeSendThread_h
#include <atomic>
#include <GenericThread.h> #include <GenericThread.h>
#include <OctreeElementBag.h> #include <OctreeElementBag.h>
@ -21,6 +23,8 @@
class OctreeServer; class OctreeServer;
using AtomicUIntStat = std::atomic<uintmax_t>;
/// Threaded processor for sending octree packets to a single client /// Threaded processor for sending octree packets to a single client
class OctreeSendThread : public GenericThread { class OctreeSendThread : public GenericThread {
Q_OBJECT Q_OBJECT
@ -30,12 +34,12 @@ public:
void setIsShuttingDown(); void setIsShuttingDown();
static quint64 _totalBytes; static AtomicUIntStat _totalBytes;
static quint64 _totalWastedBytes; static AtomicUIntStat _totalWastedBytes;
static quint64 _totalPackets; static AtomicUIntStat _totalPackets;
static quint64 _usleepTime; static AtomicUIntStat _usleepTime;
static quint64 _usleepCalls; static AtomicUIntStat _usleepCalls;
protected: protected:
/// Implements generic processing behavior for this thread. /// Implements generic processing behavior for this thread.

22
libraries/octree/src/OctreeElement.cpp
View file

@ -28,11 +28,11 @@
#include "OctreeLogging.h" #include "OctreeLogging.h"
#include "SharedUtil.h" #include "SharedUtil.h"
quint64 OctreeElement::_octreeMemoryUsage = 0; AtomicUIntStat OctreeElement::_octreeMemoryUsage = 0;
quint64 OctreeElement::_octcodeMemoryUsage = 0; AtomicUIntStat OctreeElement::_octcodeMemoryUsage = 0;
quint64 OctreeElement::_externalChildrenMemoryUsage = 0; AtomicUIntStat OctreeElement::_externalChildrenMemoryUsage = 0;
quint64 OctreeElement::_voxelNodeCount = 0; AtomicUIntStat OctreeElement::_voxelNodeCount = 0;
quint64 OctreeElement::_voxelNodeLeafCount = 0; AtomicUIntStat OctreeElement::_voxelNodeLeafCount = 0;
void OctreeElement::resetPopulationStatistics() { void OctreeElement::resetPopulationStatistics() {
_voxelNodeCount = 0; _voxelNodeCount = 0;
@ -245,13 +245,13 @@ bool OctreeElement::isParentOf(OctreeElementPointer possibleChild) const {
return false; return false;
} }
quint64 OctreeElement::_getChildAtIndexTime = 0; AtomicUIntStat OctreeElement::_getChildAtIndexTime = 0;
quint64 OctreeElement::_getChildAtIndexCalls = 0; AtomicUIntStat OctreeElement::_getChildAtIndexCalls = 0;
quint64 OctreeElement::_setChildAtIndexTime = 0; AtomicUIntStat OctreeElement::_setChildAtIndexTime = 0;
quint64 OctreeElement::_setChildAtIndexCalls = 0; AtomicUIntStat OctreeElement::_setChildAtIndexCalls = 0;
quint64 OctreeElement::_externalChildrenCount = 0; AtomicUIntStat OctreeElement::_externalChildrenCount = 0;
quint64 OctreeElement::_childrenCount[NUMBER_OF_CHILDREN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; AtomicUIntStat OctreeElement::_childrenCount[NUMBER_OF_CHILDREN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
OctreeElementPointer OctreeElement::getChildAtIndex(int childIndex) const { OctreeElementPointer OctreeElement::getChildAtIndex(int childIndex) const {
#ifdef SIMPLE_CHILD_ARRAY #ifdef SIMPLE_CHILD_ARRAY

27
libraries/octree/src/OctreeElement.h
View file

@ -15,6 +15,8 @@
//#define SIMPLE_CHILD_ARRAY //#define SIMPLE_CHILD_ARRAY
#define SIMPLE_EXTERNAL_CHILDREN #define SIMPLE_EXTERNAL_CHILDREN
#include <atomic>
#include <QReadWriteLock> #include <QReadWriteLock>
#include <OctalCode.h> #include <OctalCode.h>
@ -24,6 +26,9 @@
#include "ViewFrustum.h" #include "ViewFrustum.h"
#include "OctreeConstants.h" #include "OctreeConstants.h"
using AtomicUIntStat = std::atomic<uintmax_t>;
class EncodeBitstreamParams; class EncodeBitstreamParams;
class Octree; class Octree;
class OctreeElement; class OctreeElement;
@ -290,20 +295,20 @@ protected:
//static QReadWriteLock _updateHooksLock; //static QReadWriteLock _updateHooksLock;
static std::vector<OctreeElementUpdateHook*> _updateHooks; static std::vector<OctreeElementUpdateHook*> _updateHooks;
static quint64 _voxelNodeCount; static AtomicUIntStat _voxelNodeCount;
static quint64 _voxelNodeLeafCount; static AtomicUIntStat _voxelNodeLeafCount;
static quint64 _octreeMemoryUsage; static AtomicUIntStat _octreeMemoryUsage;
static quint64 _octcodeMemoryUsage; static AtomicUIntStat _octcodeMemoryUsage;
static quint64 _externalChildrenMemoryUsage; static AtomicUIntStat _externalChildrenMemoryUsage;
static quint64 _getChildAtIndexTime; static AtomicUIntStat _getChildAtIndexTime;
static quint64 _getChildAtIndexCalls; static AtomicUIntStat _getChildAtIndexCalls;
static quint64 _setChildAtIndexTime; static AtomicUIntStat _setChildAtIndexTime;
static quint64 _setChildAtIndexCalls; static AtomicUIntStat _setChildAtIndexCalls;
static quint64 _externalChildrenCount; static AtomicUIntStat _externalChildrenCount;
static quint64 _childrenCount[NUMBER_OF_CHILDREN + 1]; static AtomicUIntStat _childrenCount[NUMBER_OF_CHILDREN + 1];
}; };
#endif // hifi_OctreeElement_h #endif // hifi_OctreeElement_h

18
libraries/octree/src/OctreePacketData.cpp
View file

@ -16,14 +16,12 @@
#include "OctreePacketData.h" #include "OctreePacketData.h"
bool OctreePacketData::_debug = false; bool OctreePacketData::_debug = false;
quint64 OctreePacketData::_totalBytesOfOctalCodes = 0; AtomicUIntStat OctreePacketData::_totalBytesOfOctalCodes = 0;
quint64 OctreePacketData::_totalBytesOfBitMasks = 0; AtomicUIntStat OctreePacketData::_totalBytesOfBitMasks = 0;
quint64 OctreePacketData::_totalBytesOfColor = 0; AtomicUIntStat OctreePacketData::_totalBytesOfColor = 0;
quint64 OctreePacketData::_totalBytesOfValues = 0; AtomicUIntStat OctreePacketData::_totalBytesOfValues = 0;
quint64 OctreePacketData::_totalBytesOfPositions = 0; AtomicUIntStat OctreePacketData::_totalBytesOfPositions = 0;
quint64 OctreePacketData::_totalBytesOfRawData = 0; AtomicUIntStat OctreePacketData::_totalBytesOfRawData = 0;
OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) { OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) {
changeSettings(enableCompression, targetSize); // does reset... changeSettings(enableCompression, targetSize); // does reset...
@ -490,8 +488,8 @@ bool OctreePacketData::appendRawData(QByteArray data) {
} }
quint64 OctreePacketData::_compressContentTime = 0; AtomicUIntStat OctreePacketData::_compressContentTime = 0;
quint64 OctreePacketData::_compressContentCalls = 0; AtomicUIntStat OctreePacketData::_compressContentCalls = 0;
bool OctreePacketData::compressContent() { bool OctreePacketData::compressContent() {
PerformanceWarning warn(false, "OctreePacketData::compressContent()", false, &_compressContentTime, &_compressContentCalls); PerformanceWarning warn(false, "OctreePacketData::compressContent()", false, &_compressContentTime, &_compressContentCalls);

20
libraries/octree/src/OctreePacketData.h
View file

@ -22,6 +22,8 @@
#ifndef hifi_OctreePacketData_h #ifndef hifi_OctreePacketData_h
#define hifi_OctreePacketData_h #define hifi_OctreePacketData_h
#include <atomic>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QUuid> #include <QUuid>
@ -35,6 +37,8 @@
#include "OctreeConstants.h" #include "OctreeConstants.h"
#include "OctreeElement.h" #include "OctreeElement.h"
using AtomicUIntStat = std::atomic<uintmax_t>;
typedef unsigned char OCTREE_PACKET_FLAGS; typedef unsigned char OCTREE_PACKET_FLAGS;
typedef uint16_t OCTREE_PACKET_SEQUENCE; typedef uint16_t OCTREE_PACKET_SEQUENCE;
const uint16_t MAX_OCTREE_PACKET_SEQUENCE = 65535; const uint16_t MAX_OCTREE_PACKET_SEQUENCE = 65535;
@ -286,15 +290,15 @@ private:
static bool _debug; static bool _debug;
static quint64 _compressContentTime; static AtomicUIntStat _compressContentTime;
static quint64 _compressContentCalls; static AtomicUIntStat _compressContentCalls;
static quint64 _totalBytesOfOctalCodes; static AtomicUIntStat _totalBytesOfOctalCodes;
static quint64 _totalBytesOfBitMasks; static AtomicUIntStat _totalBytesOfBitMasks;
static quint64 _totalBytesOfColor; static AtomicUIntStat _totalBytesOfColor;
static quint64 _totalBytesOfValues; static AtomicUIntStat _totalBytesOfValues;
static quint64 _totalBytesOfPositions; static AtomicUIntStat _totalBytesOfPositions;
static quint64 _totalBytesOfRawData; static AtomicUIntStat _totalBytesOfRawData;
}; };
#endif // hifi_OctreePacketData_h #endif // hifi_OctreePacketData_h

8
libraries/shared/src/PerfStat.h
View file

@ -24,19 +24,21 @@
#include <string> #include <string>
#include <map> #include <map>
using AtomicUIntStat = std::atomic<uintmax_t>;
class PerformanceWarning { class PerformanceWarning {
private: private:
quint64 _start; quint64 _start;
const char* _message; const char* _message;
bool _renderWarningsOn; bool _renderWarningsOn;
bool _alwaysDisplay; bool _alwaysDisplay;
quint64* _runningTotal; AtomicUIntStat* _runningTotal;
quint64* _totalCalls; AtomicUIntStat* _totalCalls;
static bool _suppressShortTimings; static bool _suppressShortTimings;
public: public:
PerformanceWarning(bool renderWarnings, const char* message, bool alwaysDisplay = false, PerformanceWarning(bool renderWarnings, const char* message, bool alwaysDisplay = false,
quint64* runningTotal = NULL, quint64* totalCalls = NULL) : AtomicUIntStat* runningTotal = NULL, AtomicUIntStat* totalCalls = NULL) :
_start(usecTimestampNow()), _start(usecTimestampNow()),
_message(message), _message(message),
_renderWarningsOn(renderWarnings), _renderWarningsOn(renderWarnings),