Monitor: Use enum instead of bool for schedulerState

llunak · Oct 26, 2014 · f574a2f · f574a2f
1 parent 162e5d1
commit f574a2f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/src/fakemonitor.cc b/src/fakemonitor.cc
@@ -61,7 +61,7 @@ FakeMonitor::FakeMonitor(HostInfoManager* manager, QObject* parent)
     m_updateTimer->start();
     connect(m_updateTimer, SIGNAL(timeout()), SLOT(update()));
 
-    setSchedulerState(true);
+    setSchedulerState(Online);
 
     for (HostId i = 0; i < MAX_HOST_COUNT; ++i) {
         createHostInfo(i+1);

diff --git a/src/icecreammonitor.cc b/src/icecreammonitor.cc
@@ -76,7 +76,7 @@ void IcecreamMonitor::checkScheduler(bool deleteit)
         m_fd_type = QSocketNotifier::Exception;
         delete m_discover;
         m_discover = 0;
-        setSchedulerState(false);
+        setSchedulerState(Offline);
     } else if ( m_scheduler )
         return;
     QTimer::singleShot( 1000+(qrand()&1023), this, SLOT( slotCheckScheduler() ) ); // TODO: check if correct
@@ -134,7 +134,7 @@ void IcecreamMonitor::slotCheckScheduler()
                 QTimer::singleShot(0, this, SLOT(slotCheckScheduler()));
             }
             else {
-                setSchedulerState( true );
+                setSchedulerState(Online);
             }
             return;
         }
@@ -154,7 +154,7 @@ void IcecreamMonitor::slotCheckScheduler()
             QTimer::singleShot(1000+(qrand()&1023), this, SLOT(slotCheckScheduler()));
 
     }
-    setSchedulerState( false );
+    setSchedulerState(Offline);
 }
 
 void IcecreamMonitor::msgReceived()
@@ -169,7 +169,7 @@ bool IcecreamMonitor::handle_activity()
     Msg *m = m_scheduler->get_msg ();
     if ( !m ) {
         checkScheduler( true );
-        setSchedulerState( false );
+        setSchedulerState(Offline);
         return false;
     }
 

diff --git a/src/monitor.cc b/src/monitor.cc
@@ -25,7 +25,7 @@
 Monitor::Monitor(HostInfoManager *manager, QObject *parent)
     : QObject(parent)
     , m_hostInfoManager(manager)
-    , m_schedulerState(false)
+    , m_schedulerState(Offline)
 {
 }
 
@@ -39,18 +39,18 @@ void Monitor::setCurrentNetname(const QByteArray& netname)
     m_currentNetname = netname;
 }
 
-bool Monitor::schedulerState() const
+Monitor::SchedulerState Monitor::schedulerState() const
 {
     return m_schedulerState;
 }
 
-void Monitor::setSchedulerState( bool online )
+void Monitor::setSchedulerState(SchedulerState state)
 {
-    if (m_schedulerState == online)
+    if (m_schedulerState == state)
         return;
 
-    m_schedulerState = online;
-    emit schedulerStateChanged( online );
+    m_schedulerState = state;
+    emit schedulerStateChanged(state);
 }
 
 QList<Job> Monitor::jobHistory() const

diff --git a/src/monitor.h b/src/monitor.h
@@ -36,25 +36,31 @@ class Job;
 class Monitor : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool schedulerState READ schedulerState WRITE setSchedulerState NOTIFY schedulerStateChanged)
+    Q_PROPERTY(SchedulerState schedulerState READ schedulerState WRITE setSchedulerState NOTIFY schedulerStateChanged)
+    Q_ENUMS(SchedulerState)
 
 public:
+    enum SchedulerState {
+        Online,
+        Offline,
+    };
+
     explicit Monitor(HostInfoManager *manager, QObject* parent = 0);
 
     QByteArray currentNetname() const;
     void setCurrentNetname(const QByteArray &);
 
-    bool schedulerState() const;
+    SchedulerState schedulerState() const;
 
     virtual QList<Job> jobHistory() const;
 
     HostInfoManager *hostInfoManager() const { return m_hostInfoManager; }
 
 protected:
-    void setSchedulerState(bool online);
+    void setSchedulerState(SchedulerState online);
 
 Q_SIGNALS:
-    void schedulerStateChanged(bool);
+    void schedulerStateChanged(SchedulerState);
 
     void jobUpdated(const Job& job);
     void nodeRemoved(HostId id);
@@ -63,7 +69,7 @@ class Monitor : public QObject
 private:
     HostInfoManager *m_hostInfoManager;
     QByteArray m_currentNetname;
-    bool m_schedulerState;
+    SchedulerState m_schedulerState;
 };
 
 #endif // ICEMON_MONITOR_H