manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

from long long unsigned int to std::ptrdiff_t

This commit is contained in:
Paolo Cignoni 2015-09-10 10:18:10 +00:00
parent 032eaf47fd
commit 5b34b5c8e6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wrap/system/memory_info.h
View File

@ -46,21 +46,21 @@ namespace vcg
const char* _exctext; const char* _exctext;
}; };
MemoryInfo(long long unsigned int originalmem) MemoryInfo(std::ptrdiff_t originalmem)
:_originaltotalmemory(originalmem),_currentfreememory(_originaltotalmemory) :_originaltotalmemory(originalmem),_currentfreememory(_originaltotalmemory)
{ {
} }
virtual ~MemoryInfo() {} virtual ~MemoryInfo() {}
virtual void acquiredMemory(long long unsigned int mem) = 0; virtual void acquiredMemory(std::ptrdiff_t mem) = 0;
virtual long long unsigned int usedMemory() const = 0; virtual std::ptrdiff_t usedMemory() const = 0;
virtual long long unsigned int currentFreeMemory() const = 0; virtual std::ptrdiff_t currentFreeMemory() const = 0;
virtual void releasedMemory(long long unsigned int mem = 0) = 0; virtual void releasedMemory(std::ptrdiff_t mem = 0) = 0;
virtual bool isAdditionalMemoryAvailable(long long unsigned int mem) = 0; virtual bool isAdditionalMemoryAvailable(std::ptrdiff_t mem) = 0;
protected: protected:
const long long unsigned int _originaltotalmemory; const std::ptrdiff_t _originaltotalmemory;
long long unsigned int _currentfreememory; std::ptrdiff_t _currentfreememory;
}; };
//WARNING: this is not a thread safe class. The object derived from MemoryInfo are intended to be used inside GLMeshAttributeFeeder as static variable in order to manage the available GPUMemory. //WARNING: this is not a thread safe class. The object derived from MemoryInfo are intended to be used inside GLMeshAttributeFeeder as static variable in order to manage the available GPUMemory.
@ -71,14 +71,14 @@ namespace vcg
class NotThreadSafeMemoryInfo : public MemoryInfo class NotThreadSafeMemoryInfo : public MemoryInfo
{ {
public: public:
NotThreadSafeMemoryInfo(long long unsigned int originalmem) NotThreadSafeMemoryInfo(std::ptrdiff_t originalmem)
:MemoryInfo(originalmem) :MemoryInfo(originalmem)
{ {
} }
~NotThreadSafeMemoryInfo() {} ~NotThreadSafeMemoryInfo() {}
void acquiredMemory(long long unsigned int mem) void acquiredMemory(std::ptrdiff_t mem)
{ {
if (mem > _originaltotalmemory) if (mem > _originaltotalmemory)
throw MemoryInfo::MemoryInfoException("It has been requested more memory than the total one.\\n"); throw MemoryInfo::MemoryInfoException("It has been requested more memory than the total one.\\n");
@ -89,17 +89,17 @@ namespace vcg
_currentfreememory -= mem; _currentfreememory -= mem;
} }
long long unsigned int usedMemory() const std::ptrdiff_t usedMemory() const
{ {
return _originaltotalmemory - _currentfreememory; return _originaltotalmemory - _currentfreememory;
} }
long long unsigned int currentFreeMemory() const std::ptrdiff_t currentFreeMemory() const
{ {
return _currentfreememory; return _currentfreememory;
} }
void releasedMemory(long long unsigned int mem = 0) void releasedMemory(std::ptrdiff_t mem = 0)
{ {
if (mem > _originaltotalmemory) if (mem > _originaltotalmemory)
throw MemoryInfo::MemoryInfoException("It has been released more memory than the total one. Something strange happened!\\n"); throw MemoryInfo::MemoryInfoException("It has been released more memory than the total one. Something strange happened!\\n");
@ -107,7 +107,7 @@ namespace vcg
_currentfreememory += mem; _currentfreememory += mem;
} }
bool isAdditionalMemoryAvailable(long long unsigned int mem) bool isAdditionalMemoryAvailable(std::ptrdiff_t mem)
{ {
return (_currentfreememory >= mem); return (_currentfreememory >= mem);
} }