[cig-commits] commit: Repeatedly searching for error streams was causing

[Mercurial]

changeset:   12:e73cc2d56e67
user:        LukeHodkinson
date:        Sun May 27 23:20:14 2007 +0000
files:       MaterialPoints/src/OneToOneMapper.c MaterialPoints/src/OneToOneMapper.h
description:
Repeatedly searching for error streams was causing
the one-to-one mapper to be veeeeery slow. Added an
error stream to the class.


diff -r b5c1b4cc3a05 -r e73cc2d56e67 MaterialPoints/src/OneToOneMapper.c
--- a/MaterialPoints/src/OneToOneMapper.c	Fri May 25 06:39:39 2007 +0000
+++ b/MaterialPoints/src/OneToOneMapper.c	Sun May 27 23:20:14 2007 +0000
@@ -113,6 +113,7 @@ void _OneToOneMapper_Init( void* mapper,
 
 	_IntegrationPointMapper_Init( mapper, integrationSwarm );
 	
+	self->errorStream = Journal_MyStream( Error_Type, self );
 	self->materialSwarm = materialSwarm;
 
 	ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, False );
@@ -200,14 +201,14 @@ MaterialPoint* OneToOneMapper_GetMateria
 	ref = OneToOneMapper_GetMaterialRef( self, integrationPoint );
 	Journal_Firewall(
 			ref != NULL,
-			Journal_MyStream( Error_Type, self ),
+			self->errorStream, 
 			"In func %s, no MaterialPointRef found on point\n",
 			__func__ );
 
 	swarm = (MaterialPointsSwarm*)Swarm_Register_At( Swarm_Register_GetSwarm_Register(), ref->swarm_I );
 	Journal_Firewall(
 			swarm != NULL,
-			Journal_MyStream( Error_Type, self ),
+			self->errorStream, 
 			"In func %s, no swarm found on for index %d\n",
 			__func__,
 			ref->swarm_I );
@@ -218,7 +219,7 @@ MaterialPoint* OneToOneMapper_GetMateria
 	materialPoint = (MaterialPoint*)Swarm_ParticleAt( swarm, ref->particle_I );
 	Journal_Firewall(
 			materialPoint != NULL,
-			Journal_MyStream( Error_Type, self ),
+			self->errorStream, 
 			"In func %s, no MaterialPoint found for swarm index %d, point index %d\n",
 			__func__,
 			ref->swarm_I,
diff -r b5c1b4cc3a05 -r e73cc2d56e67 MaterialPoints/src/OneToOneMapper.h
--- a/MaterialPoints/src/OneToOneMapper.h	Fri May 25 06:39:39 2007 +0000
+++ b/MaterialPoints/src/OneToOneMapper.h	Sun May 27 23:20:14 2007 +0000
@@ -65,6 +65,7 @@
 	#define __OneToOneMapper \
 		__IntegrationPointMapper \
 		\
+		Stream*				errorStream; \
 		MaterialPointsSwarm*		materialSwarm; \
 		Index                           materialRefHandle; /**< Extension handle to reference struct of material points */