ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/cbrown/Development/Plotting/Modules/GeneralToolBox.C

Comparing UserCode/cbrown/Development/Plotting/Modules/GeneralToolBox.C (file contents):
Revision 1.34 by buchmann, Thu Feb 7 14:30:09 2013 UTC vs.
Revision 1.35 by buchmann, Mon Feb 25 15:36:39 2013 UTC

#	Line 1236 | Line 1236 | bool Contains(string wholestring, string
1236		else return false;
1237		}
1238
1239	+
1240		//////////////////////////////////////////////////////////////////////////////
1241		//
1242		// http://stackoverflow.com/questions/669438/how-to-get-memory-usage-at-run-time-in-c
#	Line 1248 | Line 1249 | bool Contains(string wholestring, string
1249		/* usage:
1250		double vm2, rss2;
1251		process_mem_usage(vm2, rss2);
1252	<	cout << "Memory usage: VM: " << vm << "; RSS: " << rss << endl;
1252	>	cout << "Memory usage: VM: " << vm2 << "; RSS: " << rss2 << endl;
1253		*/
1254
1255		void process_mem_usage(double& vm_usage, double& resident_set)

Diff Legend

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