Changeset 11253

Timestamp:

07/05/11 10:24:02 (13 years ago)

Author:

tbretz

Message:

Changed SetConfiguration to EvalConfiguration and its return value from bool to int; Main now returns with its return value if it is positive or zero.

Location:

trunk/FACT++/src

Files:

• Main.h (modified) (2 diffs)
• datalogger.cc (modified) (5 diffs)
• drivectrl.cc (modified) (4 diffs)
• fadctrl.cc (modified) (10 diffs)
• fscctrl.cc (modified) (4 diffs)
• ftmctrl.cc (modified) (4 diffs)

trunk/FACT++/src/Main.h

@@ -26 +26 @@
     // Start io_service.run to only use the commandHandler command detaching
     AutoScheduler<S> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 
@@ -48 +48 @@
 
     S io_service(wout);
-    if (!io_service.SetConfiguration(conf))
-        return -1;
+    const int rc = io_service.EvalConfiguration(conf);
+    if (rc>=0)
+        return rc;
 
     shell.SetReceiver(io_service);

trunk/FACT++/src/datalogger.cc

@@ -205 +205 @@
     ~DataLogger(); 
 
-    bool SetConfiguration(Configuration& conf);
+    int EvalConfiguration(Configuration& conf);
 
 private:
@@ -2440 +2440 @@
 //! @param conf the configuration object that should be used
 //!
-bool DataLogger::SetConfiguration(Configuration& conf)
+int DataLogger::EvalConfiguration(Configuration& conf)
 {
     fDebugIsOn = conf.Get<bool>("debug");
@@ -2482 +2482 @@
         {
             Error("Time out delay for old run numbers should be greater than 0 minute");
-            return false;
+            return 1;
         }
         fRunNumberTimeout = timeout;
     }
-    return true;
+    return -1;
 }
 
@@ -2505 +2505 @@
     // Start io_service.run to only use the commandHandler command detaching
     DataLogger logger(wout);
-    if (!logger.SetConfiguration(conf))
+    if (!logger.EvalConfiguration(conf))
         return -1;
 
@@ -2542 +2542 @@
     DataLogger logger(wout);
 
-    if (!logger.SetConfiguration(conf))
+    if (!logger.EvalConfiguration(conf))
         return -1;
     

trunk/FACT++/src/drivectrl.cc

@@ -847 +847 @@
     }
 
-    bool SetConfiguration(const Configuration &conf)
+    int EvalConfiguration(const Configuration &conf)
     {
         SetEndpoint(conf.Get<string>("addr"));
@@ -853 +853 @@
         fDrive.SetVerbose(!conf.Get<bool>("quiet"));
 
-        return true;
+        return -1;
     }
 };
@@ -885 +885 @@
     // Start io_service.run to only use the commandHandler command detaching
     StateMachineDrive<S, T> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 
@@ -909 +909 @@
 
     StateMachineDrive<S, R> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 

trunk/FACT++/src/fadctrl.cc

@@ -1597 +1597 @@
     }
 
-    bool SetConfiguration(const Configuration &conf)
+    int EvalConfiguration(const Configuration &conf)
     {
         fIsVerbose = !conf.Get<bool>("quiet");
@@ -1614 +1614 @@
             const tcp::endpoint endpoint = GetEndpoint(addr);
             if (endpoint==tcp::endpoint())
-                return false;
+                return 1;
 
             for (int i=0; i<num; i++)
@@ -1620 +1620 @@
 
             StartConnection();
-            return true;
+            return -1;
         }
         // ^^^^^ for debugging ^^^^^
@@ -1626 +1626 @@
         if (!(conf.Has("base-addr") ^ conf.Has("addr")))
         {
-           T::Out() << kRed << "SetConfiguration - Only --base-addr or --addr allowed." << endl;
-           return false;
+           T::Out() << kRed << "EvalConfiguration - Only --base-addr or --addr allowed." << endl;
+           return 2;
         }
 
@@ -1639 +1639 @@
             const tcp::endpoint endpoint = GetEndpoint(base);
             if (endpoint==tcp::endpoint())
-                return false;
+                return 1;
 
             const ba::ip::address_v4::bytes_type ip = endpoint.address().to_v4().to_bytes();
@@ -1645 +1645 @@
             if (ip[2]>250 || ip[3]>244)
             {
-                T::Out() << kRed << "SetConfiguration - IP address given by --base-addr out-of-range." << endl;
-                return false;
+                T::Out() << kRed << "EvalConfiguration - IP address given by --base-addr out-of-range." << endl;
+                return 3;
             }
 
@@ -1667 +1667 @@
                 const tcp::endpoint endpoint = GetEndpoint(*i);
                 if (endpoint==tcp::endpoint())
-                    return false;
+                    return 1;
 
                 AddEndpoint(endpoint);
@@ -1675 +1675 @@
         StartConnection();
 
-        return true;
+        return -1;
     }
 
@@ -1708 +1708 @@
     // Start io_service.run to only use the commandHandler command detaching
     StateMachineFAD<S> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 
@@ -1732 +1732 @@
 
     StateMachineFAD<S> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 

trunk/FACT++/src/fscctrl.cc

@@ -518 +518 @@
     }
 
-    bool SetConfiguration(const Configuration &conf)
+    int EvalConfiguration(const Configuration &conf)
     {
         SetEndpoint(conf.Get<string>("addr"));
@@ -524 +524 @@
         fFSC.SetVerbose(!conf.Get<bool>("quiet"));
 
-        return true;
+        return -1;
     }
 };
@@ -557 +557 @@
     // Start io_service.run to only use the commandHandler command detaching
     StateMachineFSC<S, T> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 
@@ -581 +581 @@
 
     StateMachineFSC<S, R> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 

trunk/FACT++/src/ftmctrl.cc

@@ -1828 +1828 @@
     }
 
-    bool SetConfiguration(const Configuration &conf)
+    int EvalConfiguration(const Configuration &conf)
     {
         SetEndpoint(conf.Get<string>("addr"));
@@ -1838 +1838 @@
 //        fFTM.SetDefaultSetup(conf.Get<string>("default-setup"));
 
-        return true;
+        return -1;
     }
 };
@@ -1870 +1870 @@
     // Start io_service.run to only use the commandHandler command detaching
     StateMachineFTM<S, T> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;
 
@@ -1894 +1894 @@
 
     StateMachineFTM<S, R> io_service(wout);
-    if (!io_service.SetConfiguration(conf))
+    if (!io_service.EvalConfiguration(conf))
         return -1;