[cig-commits] r4828 - in long/3D/Gale/trunk/src/StGermain: .
Base/Container/src
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:46:20 PDT 2006
Author: walter
Date: 2006-10-11 13:46:19 -0700 (Wed, 11 Oct 2006)
New Revision: 4828
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c
long/3D/Gale/trunk/src/StGermain/Base/Container/src/MemoryPool.c
long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.h
long/3D/Gale/trunk/src/StGermain/Base/Container/src/UIntMap.c
long/3D/Gale/trunk/src/StGermain/Base/Container/src/types.h
Log:
r2885 at earth: boo | 2006-10-11 13:42:31 -0700
r2801 at earth (orig r3789): RaquibulHassan | 2006-09-10 20:26:19 -0700
* Renaming a typedef which was conflicting with a Mac header.
* Getting rid of mallocs in the Memory pool and replacing them with Memory_Allocs
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2884
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3788
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2885
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3789
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c 2006-10-11 20:46:19 UTC (rev 4828)
@@ -265,7 +265,7 @@
void Array_1DTo2D( unsigned nBlocks, unsigned* sizes, void* srcArray,
void*** dstArrays, size_t itemSize )
{
- Byte** tmp;
+ Stg_Byte** tmp;
unsigned* tmpSizes;
unsigned curPos = 0;
unsigned b_i;
@@ -281,12 +281,12 @@
tmpSizes[b_i] = sizes[b_i] * (unsigned)itemSize;
/* Allocate. */
- tmp = Memory_Alloc_2DComplex_Unnamed( Byte, nBlocks, tmpSizes );
+ tmp = Memory_Alloc_2DComplex_Unnamed( Stg_Byte, nBlocks, tmpSizes );
for( b_i = 0; b_i < nBlocks; b_i++ ) {
if( sizes[b_i] == 0 )
continue;
- memcpy( tmp[b_i], (Byte*)srcArray + curPos, tmpSizes[b_i] );
+ memcpy( tmp[b_i], (Stg_Byte*)srcArray + curPos, tmpSizes[b_i] );
curPos += tmpSizes[b_i];
}
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/MemoryPool.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/MemoryPool.c 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/MemoryPool.c 2006-10-11 20:46:19 UTC (rev 4828)
@@ -97,10 +97,10 @@
assert( self );
_Stg_Class_Init ((Stg_Class*) self);
- self->elements = (char*)malloc( self->elementSize * self->numElements );
+ self->elements = Memory_Alloc_Bytes_Unnamed( self->elementSize * self->numElements, char );
memset( self->elements, 0, self->elementSize * self->numElements );
- self->pool = (char**)malloc( sizeof( char* ) * self->numElements );
+ self->pool = Memory_Alloc_Bytes_Unnamed( sizeof( char* ) * self->numElements, char* );
memset( self->pool, 0, sizeof(char*) * self->numElements );
for( i=0; i<self->numElements; i++ ){
@@ -145,8 +145,8 @@
self = (MemoryPool*)memPool;
assert (self);
- free( self->elements );
- free( self->pool );
+ Memory_Free( self->elements );
+ Memory_Free( self->pool );
_Stg_Class_Delete( self );
}
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c 2006-10-11 20:46:19 UTC (rev 4828)
@@ -282,7 +282,7 @@
}
-void RangeSet_Unpickle( void* rangeSet, unsigned nBytes, Byte* bytes ) {
+void RangeSet_Unpickle( void* rangeSet, unsigned nBytes, Stg_Byte* bytes ) {
RangeSet* self = (RangeSet*)rangeSet;
assert( self );
@@ -374,7 +374,7 @@
}
-void RangeSet_Pickle( void* rangeSet, unsigned* nBytes, Byte** bytes ) {
+void RangeSet_Pickle( void* rangeSet, unsigned* nBytes, Stg_Byte** bytes ) {
RangeSet* self = (RangeSet*)rangeSet;
assert( self );
@@ -383,7 +383,7 @@
if( self->nInds ) {
*nBytes = sizeof(unsigned) + self->nRanges * sizeof(RangeSet_Range);
- *bytes = Memory_Alloc_Array_Unnamed( Byte, *nBytes );
+ *bytes = Memory_Alloc_Array_Unnamed( Stg_Byte, *nBytes );
((unsigned*)*bytes)[0] = self->nInds;
if( self->nRanges )
memcpy( *bytes + sizeof(unsigned), self->ranges, *nBytes - sizeof(unsigned) );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.h 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.h 2006-10-11 20:46:19 UTC (rev 4828)
@@ -102,14 +102,14 @@
void RangeSet_Union( void* rangeSet, RangeSet* rSet );
void RangeSet_Intersection( void* rangeSet, RangeSet* rSet );
void RangeSet_Subtraction( void* rangeSet, RangeSet* rSet );
- void RangeSet_Unpickle( void* rangeSet, unsigned nBytes, Byte* bytes );
+ void RangeSet_Unpickle( void* rangeSet, unsigned nBytes, Stg_Byte* bytes );
void RangeSet_GetIndices( void* rangeSet, unsigned* nInds, unsigned** inds );
Bool RangeSet_HasIndex( void* rangeSet, unsigned ind );
unsigned RangeSet_GetNIndices( void* rangeSet );
unsigned RangeSet_GetNRanges( void* rangeSet );
void RangeSet_GetRange( void* rangeSet, unsigned ind, RangeSet_Range* range );
- void RangeSet_Pickle( void* rangeSet, unsigned* nBytes, Byte** bytes );
+ void RangeSet_Pickle( void* rangeSet, unsigned* nBytes, Stg_Byte** bytes );
/*--------------------------------------------------------------------------------------------------------------------------
** Private Member functions
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/UIntMap.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/UIntMap.c 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/UIntMap.c 2006-10-11 20:46:19 UTC (rev 4828)
@@ -156,7 +156,6 @@
Bool UIntMap_HasKey( void* map, unsigned key ) {
UIntMap* self = (UIntMap*)map;
- BTreeNode* node;
assert( self );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/types.h 2006-10-11 20:46:17 UTC (rev 4827)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/types.h 2006-10-11 20:46:19 UTC (rev 4828)
@@ -66,7 +66,7 @@
typedef struct UIntMap UIntMap;
typedef struct MemoryPool MemoryPool;
typedef struct RangeSet RangeSet;
- typedef unsigned char Byte;
+ typedef unsigned char Stg_Byte;
typedef char BitField;
typedef struct BTreeNode BTreeNode;
More information about the cig-commits
mailing list