* Added swap usage and page faults per second data sources.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27598 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/activitymonitor/DataSource.cpp

@@ -18,15 +18,17 @@
 const DataSource* kSources[] = {
 	new UsedMemoryDataSource(),
 	new CachedMemoryDataSource(),
+	new SwapSpaceDataSource(),
+	new PageFaultsDataSource(),
+	new CPUUsageDataSource(),
+	new CPUCombinedUsageDataSource(),
+	new NetworkUsageDataSource(true),
+	new NetworkUsageDataSource(false),
 	new SemaphoresDataSource(),
 	new PortsDataSource(),
 	new ThreadsDataSource(),
 	new TeamsDataSource(),
 	new RunningAppsDataSource(),
-	new CPUUsageDataSource(),
-	new CPUCombinedUsageDataSource(),
-	new NetworkUsageDataSource(true),
-	new NetworkUsageDataSource(false),
 	new ClipboardSizeDataSource(false),
 	new ClipboardSizeDataSource(true),
 	new MediaNodesDataSource()
@@ -375,6 +377,51 @@ CachedMemoryDataSource::Primary() const
 //	#pragma mark -
 
 
+SwapSpaceDataSource::SwapSpaceDataSource()
+{
+	SystemInfo info;
+
+	fColor = (rgb_color){0, 120, 0};
+	fMaximum = info.MaxSwapSpace();
+}
+
+
+SwapSpaceDataSource::~SwapSpaceDataSource()
+{
+}
+
+
+DataSource*
+SwapSpaceDataSource::Copy() const
+{
+	return new SwapSpaceDataSource(*this);
+}
+
+
+int64
+SwapSpaceDataSource::NextValue(SystemInfo& info)
+{
+	return info.UsedSwapSpace();
+}
+
+
+const char*
+SwapSpaceDataSource::Label() const
+{
+	return "Swap Space";
+}
+
+
+bool
+SwapSpaceDataSource::Primary() const
+{
+	return true;
+}
+
+
+//	#pragma mark -
+
+
 SemaphoresDataSource::SemaphoresDataSource()
 {
 	SystemInfo info;
@@ -844,6 +891,97 @@ CPUCombinedUsageDataSource::Primary() const
 //	#pragma mark -
 
 
+PageFaultsDataSource::PageFaultsDataSource()
+	:
+	fPreviousFaults(0),
+	fPreviousTime(0)
+{
+	SystemInfo info;
+	NextValue(info);
+
+	fMinimum = 0;
+	fMaximum = 1000000000LL;
+
+	fColor = (rgb_color){200, 0, 150, 0};
+}
+
+
+PageFaultsDataSource::PageFaultsDataSource(const PageFaultsDataSource& other)
+	: DataSource(other)
+{
+	fPreviousFaults = other.fPreviousFaults;
+	fPreviousTime = other.fPreviousTime;
+}
+
+
+PageFaultsDataSource::~PageFaultsDataSource()
+{
+}
+
+
+DataSource*
+PageFaultsDataSource::Copy() const
+{
+	return new PageFaultsDataSource(*this);
+}
+
+
+void
+PageFaultsDataSource::Print(BString& text, int64 value) const
+{
+	char buffer[32];
+	snprintf(buffer, sizeof(buffer), "%.1f faults/s", value / 1024.0);
+
+	text = buffer;
+}
+
+
+int64
+PageFaultsDataSource::NextValue(SystemInfo& info)
+{
+	uint64 faults = info.PageFaults();
+
+	int64 faultsPerSecond = uint64(1024 * double(faults - fPreviousFaults)
+		/ (info.Time() - fPreviousTime) * 1000000.0);
+
+	fPreviousFaults = faults;
+	fPreviousTime = info.Time();
+
+	return faultsPerSecond;
+}
+
+
+const char*
+PageFaultsDataSource::Label() const
+{
+	return "Page Faults";
+}
+
+
+const char*
+PageFaultsDataSource::Name() const
+{
+	return "Page Faults";
+}
+
+
+bool
+PageFaultsDataSource::AdaptiveScale() const
+{
+	return true;
+}
+
+
+bool
+PageFaultsDataSource::Primary() const
+{
+	return false;
+}
+
+
+//	#pragma mark -
+
+
 NetworkUsageDataSource::NetworkUsageDataSource(bool in)
 	:
 	fIn(in),