Changeset 11043 for trunk

Timestamp:

06/16/11 21:26:48 (13 years ago)

Author:

tbretz

Message:

Added the --exec command.

Location:

trunk/FACT++/src

Files:

• drivectrl.cc (modified) (2 diffs)
• fadctrl.cc (modified) (2 diffs)
• fscctrl.cc (modified) (2 diffs)
• ftmctrl.cc (modified) (2 diffs)
• scheduler.cc (modified) (3 diffs)

trunk/FACT++/src/drivectrl.cc

@@ -932 +932 @@
     // boost::thread t(boost::bind(&StateMachineDrive<S>::Run, &io_service));
 
+    if (conf.Has("exec"))
+    {
+        const vector<string> v = conf.Get<vector<string>>("exec");
+        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
+            shell.Execute(*it);
+    }
+
     shell.Run();                 // Run the shell
     io_service.Stop();           // Signal Loop-thread to stop
@@ -954 +961 @@
         ("no-dim,d",  po_switch(),    "Disable dim services")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("exec,e",    vars<strings>(),"Execute one or more scrips at startup")
         ;
 

trunk/FACT++/src/fadctrl.cc

@@ -1463 +1463 @@
     //boost::thread t(boost::bind(&StateMachineFAD<S>::Run, &io_service));
 
+    if (conf.Has("exec"))
+    {
+        const vector<string> v = conf.Get<vector<string>>("exec");
+        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
+            shell.Execute(*it);
+    }
+
     shell.Run();                 // Run the shell
     io_service.Stop();           // Signal Loop-thread to stop
@@ -1484 +1491 @@
         ("no-dim,d",  po_switch(),    "Disable dim services")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
         ;
 

trunk/FACT++/src/fscctrl.cc

@@ -516 +516 @@
     // boost::thread t(boost::bind(&StateMachineFSC<S>::Run, &io_service));
 
+    if (conf.Has("exec"))
+    {
+        const vector<string> v = conf.Get<vector<string>>("exec");
+        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
+            shell.Execute(*it);
+    }
+
     shell.Run();                 // Run the shell
     io_service.Stop();           // Signal Loop-thread to stop
@@ -538 +545 @@
         ("no-dim,d",  po_bool(),      "Disable dim services")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
         ;
 

trunk/FACT++/src/ftmctrl.cc

@@ -1844 +1844 @@
     // boost::thread t(boost::bind(&StateMachineFTM<S>::Run, &io_service));
 
+    if (conf.Has("exec"))
+    {
+        const vector<string> v = conf.Get<vector<string>>("exec");
+        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
+            shell.Execute(*it);
+    }
+
     shell.Run();                 // Run the shell
     io_service.Stop();           // Signal Loop-thread to stop
@@ -1866 +1873 @@
         ("no-dim,d",  po_bool(),      "Disable dim services")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
         ;
 

trunk/FACT++/src/scheduler.cc

@@ -783 +783 @@
 
     //io_service.SetReady();
+    if (conf.Has("exec"))
+    {
+        const vector<string> v = conf.Get<vector<string>>("exec");
+        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
+            shell.Execute(*it);
+    }
 
     shell.Run();                 // Run the shell
@@ -804 +810 @@
     po::options_description config("Configuration");
     config.add_options()
-        ("dns",               var<string>("localhost"),  "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
-        ("log,l",             var<string>(n), "Write log-file")
-        ("no-dim,d",          po_switch(),    "Disable dim services")
-        ("console,c",         var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("dns",       var<string>("localhost"),  "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
+        ("log,l",     var<string>(n), "Write log-file")
+        ("no-dim,d",  po_switch(),    "Disable dim services")
+        ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("exec,e",    vars<string>(), "Execute one or more scrips at startup");
+
+    po::options_description control("Scheduler options");
+    control.add_options()
         ("schedule-database", var<string>()
 #if BOOST_VERSION >= 104200
@@ -836 +846 @@
     conf.AddEnv("dns", "DIM_DNS_NODE");
     conf.AddOptions(config);
+    conf.AddOptions(control);
     conf.SetArgumentPositions(p);
 }