Changeset 11575 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

07/24/11 21:00:00 (13 years ago)

Author:

tbretz

Message:

Moved common option setup to Main.h; created Main namespace

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (3 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -2331 +2331 @@
 #include "Main.h"
 
-/*
-void RunThread(StateMachineImp *io_service)
-{
-    // This is necessary so that the StateMachien Thread can signal the
-    // Readline to exit
-    io_service->Run();
-    Readline::Stop();
-}
-*/
-/*
-template<class S, class T>
-int RunDim(Configuration &conf)
-{
-    WindowLog wout;
-
-    ReadlineColor::PrintBootMsg(wout, conf.GetName(), false);
-
-    if (conf.Has("log"))
-        if (!wout.OpenLogFile(conf.Get<string>("log")))
-            wout << kRed << "ERROR - Couldn't open log-file " << conf.Get<string>("log") << ": " << strerror(errno) << endl;
-
-    // Start io_service.Run to use the StateMachineImp::Run() loop
-    // Start io_service.run to only use the commandHandler command detaching
-    StateMachineFTM<S, T> io_service(wout);
-    if (!io_service.EvalConfiguration(conf))
-        return -1;
-
-    io_service.Run();
-
-    return 0;
-}
-*/
-
 template<class T, class S, class R>
 int RunShell(Configuration &conf)
 {
-    return Main<T, StateMachineFTM<S, R>>(conf);
-/*
-    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
-
-    WindowLog &win  = shell.GetStreamIn();
-    WindowLog &wout = shell.GetStreamOut();
-
-    if (conf.Has("log"))
-        if (!wout.OpenLogFile(conf.Get<string>("log")))
-            win << kRed << "ERROR - Couldn't open log-file " << conf.Get<string>("log") << ": " << strerror(errno) << endl;
-
-    StateMachineFTM<S, R> io_service(wout);
-    if (!io_service.EvalConfiguration(conf))
-        return -1;
-
-    shell.SetReceiver(io_service);
-
-    boost::thread t(bind(RunThread, &io_service));
-    // boost::thread t(bind(&StateMachineFTM<S>::Run, &io_service));
-
-    if (conf.Has("cmd"))
-    {
-        const vector<string> v = conf.Get<vector<string>>("cmd");
-        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
-            shell.ProcessLine(*it);
-    }
-
-    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);
-    }
-
-    if (conf.Get<bool>("quit"))
-        shell.Stop();
-
-    shell.Run();                 // Run the shell
-    io_service.Stop();           // Signal Loop-thread to stop
-    // io_service.Close();       // Obsolete, done by the destructor
-
-    // Wait until the StateMachine has finished its thread
-    // before returning and destroying the dim objects which might
-    // still be in use.
-    t.join();
-
-    return 0;
-    */
+    return Main::execute<T, StateMachineFTM<S, R>>(conf);
 }
 
 void SetupConfiguration(Configuration &conf)
 {
-    const string n = conf.GetName()+".log";
-
-    po::options_description config("Program options");
-    config.add_options()
-        ("dns",       var<string>("localhost"),       "Dim nameserver (overwites DIM_DNS_NODE environment variable)")
-        ("host",      var<string>(""),                "Address with which the Dim nameserver can connect to this host (overwites DIM_HOST_NODE environment variable)")
-        ("no-dim,d",  po_bool(),      "Disable dim services")
-        ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
-        ("cmd",       vars<string>(), "Execute one or more commands at startup")
-        ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
-        ("quit",      po_switch(),    "Quit after startup");
-        ;
-
     po::options_description control("Control options");
     control.add_options()
+        ("no-dim",        po_bool(),  "Disable dim services")
         ("addr,a",        var<string>("localhost:5000"),  "Network address of FTM")
         ("quiet,q",       po_bool(),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
@@ -2481 +2389 @@
         ;
 
-    conf.AddEnv("dns",  "DIM_DNS_NODE");
-    conf.AddEnv("host", "DIM_HOST_NODE");
-
-    conf.AddOptions(config);
     conf.AddOptions(control);
     conf.AddOptions(runtype);
@@ -2537 +2441 @@
     Configuration conf(argv[0]);
     conf.SetPrintUsage(PrintUsage);
+    Main::SetupConfiguration(conf);
     SetupConfiguration(conf);