SystemBackend-Interface ueberarbeitet

1 files changed, 20 insertions, 20 deletions

diff --git a/src/Common/SystemManager.cpp b/src/Common/SystemManager.cpp
index 4a549b7..c5eac0e 100644
--- a/src/Common/SystemManager.cpp
+++ b/src/Common/SystemManager.cpp
@@ -26,62 +26,62 @@ namespace Common {
 SystemManager SystemManager::systemManager;
 
 
-bool SystemManager::Compare::operator() (const SystemBackend *b1, const SystemBackend *b2) {
+bool SystemManager::Compare::operator() (boost::shared_ptr<SystemBackend> b1, boost::shared_ptr<SystemBackend> b2) {
   if(b1->getPriority() == b2->getPriority())
-    return (b1 > b2);
+    return (b1.get() > b2.get());
   else
     return (b1->getPriority() > b2->getPriority());
 }
 
 
-bool SystemManager::getUptimeInfo(const boost::function2<void, unsigned long, unsigned long> &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->getUptimeInfo(callback))
+bool SystemManager::getUptimeInfo(unsigned long *uptime, unsigned long *idleTime) {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->getUptimeInfo(uptime, idleTime))
       return true;
   }
 
   return false;
 }
 
-bool SystemManager::getMemoryInfo(const boost::function4<void, unsigned long, unsigned long, unsigned long, unsigned long> &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->getMemoryInfo(callback))
+bool SystemManager::getMemoryInfo(unsigned long *totalMem, unsigned long *freeMem, unsigned long *totalSwap, unsigned long *freeSwap) {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->getMemoryInfo(totalMem, freeMem, totalSwap, freeSwap))
       return true;
   }
 
   return false;
 }
 
-bool SystemManager::getLoadInfo(const boost::function5<void, unsigned long, unsigned long, float, float, float> &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->getLoadInfo(callback))
+bool SystemManager::getLoadInfo(unsigned long *currentLoad, unsigned long *nProcesses, float *loadAvg1, float *loadAvg5, float *loadAvg15) {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->getLoadInfo(currentLoad, nProcesses, loadAvg1, loadAvg5, loadAvg15))
       return true;
   }
 
   return false;
 }
 
-bool SystemManager::getFSInfo(const boost::function1<void, const std::vector<FSInfo>& > &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->getFSInfo(callback))
+bool SystemManager::getFSInfo(std::vector<FSInfo> *fsInfo) {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->getFSInfo(fsInfo))
       return true;
   }
 
   return false;
 }
 
-bool SystemManager::shutdown(const boost::function0<void> &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->shutdown(callback))
+bool SystemManager::shutdown() {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->shutdown())
       return true;
   }
 
   return false;
 }
 
-bool SystemManager::reboot(const boost::function0<void> &callback) {
-  for(std::set<SystemBackend*>::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
-    if((*backend)->reboot(callback))
+bool SystemManager::reboot() {
+  for(std::set<boost::shared_ptr<SystemBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
+    if((*backend)->reboot())
       return true;
   }