Changeset 25012

Timestamp:

04/17/08 18:04:18 (7 months ago)

Author:

mmu_man

Message:

- introduced a SystemInfoHandler class used to watch for stuff when polling isn't needed.
- used it to add a count of running apps (not exactly the same as teams).

Location:

haiku/trunk/src/apps/activitymonitor

Files:

• ActivityView.cpp (modified) (6 diffs)
• ActivityView.h (modified) (2 diffs)
• DataSource.cpp (modified) (2 diffs)
• DataSource.h (modified) (1 diff)
• Jamfile (modified) (1 diff)
• SystemInfo.cpp (modified) (3 diffs)
• SystemInfo.h (modified) (3 diffs)
• SystemInfoHandler.cpp (added)
• SystemInfoHandler.h (added)

haiku/trunk/src/apps/activitymonitor/ActivityView.cpp

@@ -22 +22 @@
 #include "DataSource.h"
 #include "SystemInfo.h"
+#include "SystemInfoHandler.h"
 
 
@@ -168 +169 @@
 {
         delete fOffscreen;
+        delete fSystemInfoHandler;
 }
 
@@ -183 +185 @@
         fLastRefresh = 0;
         fDrawResolution = 1;
+        
+        fSystemInfoHandler = new SystemInfoHandler;
 
         if (settings == NULL
@@ -350 +354 @@
 ActivityView::AttachedToWindow()
 {
+        Looper()->AddHandler(fSystemInfoHandler);
+        fSystemInfoHandler->StartWatchingStuff();
         BMessage refresh(kMsgRefresh);
         fRunner = new BMessageRunner(this, &refresh, fRefreshInterval);
@@ -360 +366 @@
 ActivityView::DetachedFromWindow()
 {
+        fSystemInfoHandler->StopWatchingStuff();
+        Looper()->RemoveHandler(fSystemInfoHandler);
         delete fRunner;
 }
@@ -739 +747 @@
 ActivityView::_Refresh()
 {
-        SystemInfo info;
+        SystemInfo info(fSystemInfoHandler);
 
         // TODO: run refresh in another thread to decouple it from the UI!

haiku/trunk/src/apps/activitymonitor/ActivityView.h

@@ -15 +15 @@
 class BMessageRunner;
 class DataSource;
+class SystemInfoHandler;
 struct data_item;
 
@@ -99 +100 @@
         int32                           fDrawResolution;
         bool                            fShowLegend;
+        SystemInfoHandler*      fSystemInfoHandler;
 };
 

haiku/trunk/src/apps/activitymonitor/DataSource.cpp

@@ -22 +22 @@
         new ThreadsDataSource(),
         new TeamsDataSource(),
+        new RunningAppsDataSource(),
         new CPUUsageDataSource(),
         new CPUCombinedUsageDataSource(),
@@ -523 +524 @@
 bool
 TeamsDataSource::AdaptiveScale() const
+{
+        return true;
+}
+
+
+//      #pragma mark -
+
+
+RunningAppsDataSource::RunningAppsDataSource()
+{
+        SystemInfo info;
+
+        fMinimum = 0;
+        fMaximum = info.MaxRunningApps();
+
+        fColor = (rgb_color){100, 150, 255};
+}
+
+
+RunningAppsDataSource::~RunningAppsDataSource()
+{
+}
+
+
+DataSource*
+RunningAppsDataSource::Copy() const
+{
+        return new RunningAppsDataSource(*this);
+}
+
+
+int64
+RunningAppsDataSource::NextValue(SystemInfo& info)
+{
+        return info.UsedRunningApps();
+}
+
+
+const char*
+RunningAppsDataSource::Label() const
+{
+        return "Running Applications";
+}
+
+
+bool
+RunningAppsDataSource::AdaptiveScale() const
 {
         return true;

haiku/trunk/src/apps/activitymonitor/DataSource.h

@@ -142 +142 @@
 
 
+class RunningAppsDataSource : public DataSource {
+public:
+                                                RunningAppsDataSource();
+        virtual                         ~RunningAppsDataSource();
+
+        virtual DataSource*     Copy() const;
+
+        virtual int64           NextValue(SystemInfo& info);
+        virtual const char*     Label() const;
+        virtual bool            AdaptiveScale() const;
+};
+
+
 class CPUUsageDataSource : public DataSource {
 public:

haiku/trunk/src/apps/activitymonitor/Jamfile

@@ -12 +12 @@
         DataSource.cpp
         SystemInfo.cpp
+        SystemInfoHandler.cpp
 
         : be tracker $(TARGET_LIBSTDC++) $(TARGET_NETWORK_LIBS)

haiku/trunk/src/apps/activitymonitor/SystemInfo.cpp

@@ -6 +6 @@
 
 #include "SystemInfo.h"
+#include "SystemInfoHandler.h"
 
 #include <net/if.h>
@@ -15 +16 @@
 
 
-SystemInfo::SystemInfo()
+SystemInfo::SystemInfo(SystemInfoHandler *handler)
         :
         fTime(system_time()),
-        fRetrievedNetwork(false)
+        fRetrievedNetwork(false),
+        fRunningApps(0)
 {
         get_system_info(&fSystemInfo);
+        
+        if (handler) {
+                fRunningApps = handler->RunningApps();
+        }
 }
 
@@ -105 +111 @@
 uint32
 SystemInfo::MaxTeams() const
+{
+        return fSystemInfo.max_teams;
+}
+
+
+uint32
+SystemInfo::UsedRunningApps() const
+{
+        return fRunningApps;
+}
+
+
+uint32
+SystemInfo::MaxRunningApps() const
 {
         return fSystemInfo.max_teams;

haiku/trunk/src/apps/activitymonitor/SystemInfo.h

@@ -9 +9 @@
 #include <OS.h>
 
+class SystemInfoHandler;
+
 
 class SystemInfo {
 public:
-                                                SystemInfo();
+                                                SystemInfo(SystemInfoHandler *handler=NULL);
                                                 ~SystemInfo();
 
@@ -31 +33 @@
                         uint32          MaxTeams() const;
 
+                        uint32          UsedRunningApps() const;
+                        uint32          MaxRunningApps() const;
+
                         bigtime_t       Time() const { return fTime; }
                         uint32          CPUCount() const { return fSystemInfo.cpu_count; }
@@ -46 +51 @@
         uint64                          fBytesReceived;
         uint64                          fBytesSent;
+        uint32                          fRunningApps;
 };