[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/brains/BlockSnapshotManager.cpp

Comparing trunk/OOPSE-2.0/src/brains/BlockSnapshotManager.cpp (file contents):
Revision 2035 by tim, Tue Feb 15 19:36:07 2005 UTC vs.
Revision 2039 by tim, Wed Feb 16 20:43:10 2005 UTC

#	Line 40 \| Line 40
40		*/
41		#include <algorithm>
42		#include "brains/BlockSnapshotManager.hpp"
43	+	#include "utils/residentMem.h"
44		#include "utils/physmem.h"
45		#include "utils/Algorithm.hpp"
46		#include "brains/SimInfo.hpp"
#	Line 54 \| Line 55 \| *BlockSnapshotManager::BlockSnapshotManager(SimInfo in**
55		nAtoms_ = info->getNGlobalAtoms();
56		nRigidBodies_ = info->getNGlobalRigidBodies();
57
58	<	double avalPhysMem = physmem_available();
58	>	double physMem = physmem_total();
59	>	double rssMem = residentMem();
60	>	double avaliablePhysMem = physMem - rssMem;
61
62	+	std::cout << "physmem = " << int(physMem) << "\trssMem = "<< rssMem << "\t availablePhysMem = " << avaliablePhysMem <<std::endl;
63		int bytesPerStuntDouble = DataStorage::getBytesPerStuntDouble(storageLayout);
64
65		int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
66
67	<	int frameCapacity = int (avalPhysMem / bytesPerFrame);
67	>	int frameCapacity = int (avaliablePhysMem / bytesPerFrame);
68
69		nSnapshotPerBlock_ = frameCapacity /blockCapacity_ ;
70
#	Line 178 \| Line 182 \| bool BlockSnapshotManager::hasZeroRefBlock(){
182		}
183
184		bool BlockSnapshotManager::hasZeroRefBlock(){
185	<	return std::find(activeRefCount_.begin(), activeRefCount_.end(), 0);
185	>	return std::find(activeRefCount_.begin(), activeRefCount_.end(), 0) != activeRefCount_.end() ? true : false;
186		}
187
188		int BlockSnapshotManager::getFirstZeroRefBlock(){

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines