Changeset 11057

Timestamp:

06/18/11 12:12:48 (13 years ago)

Author:

tbretz

Message:

Removed RunDim and replaces it with RunShell and LocalStream

File:

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

trunk/FACT++/src/fscctrl.cc

@@ -449 +449 @@
 }
 
+/*
 template<class S, class T>
 int RunDim(Configuration &conf)
 {
     WindowLog wout;
-
-    /*
-    static Test shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
-
-    WindowLog &win  = shell.GetStreamIn();
-    WindowLog &wout = shell.GetStreamOut();
-    */
 
     ReadlineColor::PrintBootMsg(wout, conf.GetName(), false);
@@ -476 +470 @@
     io_service.Run();
 
-    /*
-    shell.SetReceiver(io_service);
-
-    boost::thread t(boost::bind(RunThread, &io_service));
-    // boost::thread t(boost::bind(&StateMachineFSC<S>::Run, &io_service));
-
-    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;
 }
+*/
 
 template<class T, class S, class R>
@@ -645 +624 @@
         {
             if (conf.Get<bool>("no-dim"))
-                return RunDim<StateMachine, ConnectionFSC>(conf);
+                return RunShell<LocalStream, StateMachine, ConnectionFSC>(conf);
             else
-                return RunDim<StateMachineDim, ConnectionDimFSC>(conf);
+                return RunShell<LocalStream, StateMachineDim, ConnectionDimFSC>(conf);
         }
         // Cosole access w/ and w/o Dim