ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

64bit issue in Table allocation

Browse Source
This commit is contained in:
Joachim Schöberl 2018-01-12 15:55:29 +01:00
parent 3fffb78a20
commit d75f4e79ce
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libsrc/general/table.cpp
View File

@ -30,16 +30,16 @@ namespace netgen
BASE_TABLE :: BASE_TABLE (const FlatArray<int> & entrysizes, int elemsize) BASE_TABLE :: BASE_TABLE (const FlatArray<int> & entrysizes, int elemsize)
: data(entrysizes.Size()) : data(entrysizes.Size())
{ {
int i, cnt = 0; size_t cnt = 0;
int n = entrysizes.Size(); size_t n = entrysizes.Size();
for (i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
cnt += entrysizes[i]; cnt += entrysizes[i];
oneblock = new char[elemsize * cnt]; oneblock = new char[elemsize * cnt];
// mem_total_alloc_table += elemsize * cnt; // mem_total_alloc_table += elemsize * cnt;
cnt = 0; cnt = 0;
for (i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
{ {
data[i].maxsize = entrysizes[i]; data[i].maxsize = entrysizes[i];
data[i].size = 0; data[i].size = 0;
@ -171,15 +171,15 @@ namespace netgen
void BASE_TABLE :: AllocateElementsOneBlock (int elemsize) void BASE_TABLE :: AllocateElementsOneBlock (int elemsize)
{ {
int cnt = 0; size_t cnt = 0;
int n = data.Size(); size_t n = data.Size();
for (int i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
cnt += data[i].maxsize; cnt += data[i].maxsize;
oneblock = new char[elemsize * cnt]; oneblock = new char[elemsize * cnt];
cnt = 0; cnt = 0;
for (int i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
{ {
data[i].size = 0; data[i].size = 0;
data[i].col = &oneblock[elemsize * cnt]; data[i].col = &oneblock[elemsize * cnt];
@ -189,18 +189,18 @@ namespace netgen
int BASE_TABLE :: AllocatedElements () const size_t BASE_TABLE :: AllocatedElements () const
{ {
int els = 0; size_t els = 0;
for (int i = 0; i < data.Size(); i++) for (size_t i = 0; i < data.Size(); i++)
els += data[i].maxsize; els += data[i].maxsize;
return els; return els;
} }
int BASE_TABLE :: UsedElements () const size_t BASE_TABLE :: UsedElements () const
{ {
int els = 0; size_t els = 0;
for (int i = 0; i < data.Size(); i++) for (size_t i = 0; i < data.Size(); i++)
els += data[i].size; els += data[i].size;
return els; return els;
} }

4
libsrc/general/table.hpp
View File

@ -84,8 +84,8 @@ public:
/// ///
void AllocateElementsOneBlock (int elemsize); void AllocateElementsOneBlock (int elemsize);
int AllocatedElements () const; size_t AllocatedElements () const;
int UsedElements () const; size_t UsedElements () const;
void SetElementSizesToMaxSizes (); void SetElementSizesToMaxSizes ();
}; };