[Csp-commits] svn:csp r2137 - in trunk/csp/cspsim: . stores

[<sv...@ww...>]

Author: nsmoooose
Date: 2007-07-10 13:21:47 -0700 (Tue, 10 Jul 2007)
New Revision: 2137

Modified:
   trunk/csp/cspsim/CSPSim.cpp
   trunk/csp/cspsim/stores/StoresDatabase.cpp
   trunk/csp/cspsim/stores/StoresDatabase.h
Log:
Removed some memory leaks that occured when you:
1 started a simulation. 
2 Returned to the main menu. 
3 goto 1

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2137

Modified: trunk/csp/cspsim/CSPSim.cpp
===================================================================
--- trunk/csp/cspsim/CSPSim.cpp	2007-07-09 21:11:26 UTC (rev 2136)
+++ trunk/csp/cspsim/CSPSim.cpp	2007-07-10 20:21:47 UTC (rev 2137)
@@ -109,7 +109,6 @@
 
 CSPSim::CSPSim():
 	m_ConfigurationChanged(new wf::Signal),
-	m_DataManager(new DataManager),
 	m_Atmosphere(new Atmosphere),
 	//--m_RenderSurface(new Producer::RenderSurface),
 	m_InputEvent(new InputEvent)
@@ -268,21 +267,6 @@
 		ospath::addpath(search_path, font_path);
 		ObjectModel::setDataFilePathList(search_path);
 
-		// open the primary data archive
-		std::string cache_path = getCachePath();
-		std::string archive_file = ospath::join(cache_path, "sim.dar");
-		try {
-			DataArchive *sim = new DataArchive(archive_file.c_str(), 1);
-			assert(sim);
-			m_DataManager->addArchive(sim);
-		}
-		catch (Exception &e) {
-			CSPLOG(ERROR, APP) << "Error opening data archive " << archive_file;
-			CSPLOG(ERROR, APP) << e.getType() << ": " << e.getMessage();
-			throw e;
-			//::exit(0);
-		}
-
 		if (initSDL()) {
 			::exit(1);  // error already logged
 		}
@@ -347,6 +331,8 @@
 		m_SDLJoystick = NULL;
 	}
 
+	StoresDatabase::getInstance().reset();
+
 	// release cached objects.  this must be done before the sound engine is shut
 	// down to prevent errors when deleting cached sound samples.
 	m_DataManager = 0;
@@ -376,6 +362,24 @@
 }
 
 void CSPSim::loadSimulation() {
+	
+	m_DataManager = new DataManager();
+
+	// open the primary data archive
+	std::string cache_path = getCachePath();
+	std::string archive_file = ospath::join(cache_path, "sim.dar");
+	try {
+		DataArchive *sim = new DataArchive(archive_file.c_str(), 1);
+		assert(sim);
+		m_DataManager->addArchive(sim);
+	}
+	catch (Exception &e) {
+		CSPLOG(ERROR, APP) << "Error opening data archive " << archive_file;
+		CSPLOG(ERROR, APP) << e.getType() << ": " << e.getMessage();
+		throw e;
+		//::exit(0);
+	}
+	
 	if(m_CurrentScreen.valid()) {
 		m_CurrentScreen->onRender();
 		SDL_GL_SwapBuffers();
@@ -422,7 +426,6 @@
 	double lon = m_Terrain->getCenter().longitude();
 	m_Atmosphere->setPosition(lat, lon);
 	
-	// TODO may need a reset method when we swap theaters
 	StoresDatabase::getInstance().load(*m_DataManager, "sim:stores");
 
 	if(m_CurrentScreen.valid()) {
@@ -539,20 +542,21 @@
 }
 
 void CSPSim::unloadSimulationNow() {
+	// TODO Do we need to unload in a specific order?
 	m_ActiveObject = NULL;
-	
-	// The virtual battlefield
 	m_Battlefield = NULL;
 	m_Scene = NULL;
 	m_NetworkClient = NULL;
-
-	// TODO the terrain will eventually be encapsulated in a Theater class
 	m_Theater = NULL;
 
+	StoresDatabase::getInstance().reset();
+
 	if(m_Terrain.valid()) {
 		m_Terrain->deactivate();
 		m_Terrain = NULL;
 	}
+	
+	m_DataManager = NULL;
 }
 
 void CSPSim::displayLogoScreen() {

Modified: trunk/csp/cspsim/stores/StoresDatabase.cpp
===================================================================
--- trunk/csp/cspsim/stores/StoresDatabase.cpp	2007-07-09 21:11:26 UTC (rev 2136)
+++ trunk/csp/cspsim/stores/StoresDatabase.cpp	2007-07-10 20:21:47 UTC (rev 2137)
@@ -62,6 +62,12 @@
 	_load(data_manager, ObjectID(root), root);
 }
 
+void StoresDatabase::reset() {
+	m_StoresByKey.clear();
+	m_ParentMatrix.clear();
+	m_ChildMatrix.clear();
+}
+
 Ref<Store> StoresDatabase::getStore(std::string const &id) {
 	return getStore(Key(id));
 }

Modified: trunk/csp/cspsim/stores/StoresDatabase.h
===================================================================
--- trunk/csp/cspsim/stores/StoresDatabase.h	2007-07-09 21:11:26 UTC (rev 2136)
+++ trunk/csp/cspsim/stores/StoresDatabase.h	2007-07-10 20:21:47 UTC (rev 2137)
@@ -62,6 +62,10 @@
 	 *  objects under the path indicated by the root parameter will be indexed.
 	 */
 	void load(DataManager &data_manager, std::string const &root);
+	
+	/** Unloads all objects in this singleton. Used when we swap theatre.
+	 */
+	void reset();
 
 	/** Convenience method to get a store by id string, equivalent to getStore(Key(id)).
 	 */