Changeset 11056


Ignore:
Timestamp:
06/18/11 12:12:23 (13 years ago)
Author:
tbretz
Message:
Removed RunDim and replaces it with RunShell and LocalStream
Location:
trunk/FACT++/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/src/drivectrl.cc

    r11043 r11056  
    867867}
    868868
     869/*
    869870template<class S, class T>
    870871int RunDim(Configuration &conf)
    … …  
    872873    WindowLog wout;
    873874
    874     /*
    875     static Test shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    876 
    877     WindowLog &win  = shell.GetStreamIn();
    878     WindowLog &wout = shell.GetStreamOut();
    879     */
    880875    ReadlineColor::PrintBootMsg(wout, conf.GetName(), false);
    881876
    … …  
    892887    io_service.Run();
    893888
    894     /*
    895     shell.SetReceiver(io_service);
    896 
    897     boost::thread t(boost::bind(RunThread, &io_service));
    898     // boost::thread t(boost::bind(&StateMachineDrive<S>::Run, &io_service));
    899 
    900     shell.Run();                 // Run the shell
    901     io_service.Stop();           // Signal Loop-thread to stop
    902     // io_service.Close();       // Obsolete, done by the destructor
    903 
    904     // Wait until the StateMachine has finished its thread
    905     // before returning and destroying the dim objects which might
    906     // still be in use.
    907     t.join();
    908     */
    909 
    910889    return 0;
    911890}
     891*/
    912892
    913893template<class T, class S, class R>
    … …  
    10611041        {
    10621042            if (conf.Get<bool>("no-dim"))
    1063                 return RunDim<StateMachine, ConnectionDrive>(conf);
     1043                return RunShell<LocalStream, StateMachine, ConnectionDrive>(conf);
    10641044            else
    1065                 return RunDim<StateMachineDim, ConnectionDimDrive>(conf);
     1045                return RunShell<LocalStream, StateMachineDim, ConnectionDimDrive>(conf);
    10661046        }
    10671047        // Cosole access w/ and w/o Dim

  • trunk/FACT++/src/fadctrl.cc

    r11043 r11056  
    14081408}
    14091409
     1410/*
    14101411template<class S>
    14111412int RunDim(Configuration &conf)
    14121413{
    1413     /*
    1414      initscr();               // Start curses mode
    1415      cbreak();                // Line buffering disabled, Pass on
    1416      intrflush(stdscr, FALSE);
    1417      start_color();            // Initialize ncurses colors
    1418      use_default_colors();     // Assign terminal default colors to -1
    1419      for (int i=1; i<8; i++)
    1420         init_pair(i, i, -1);  // -1: def background
    1421         scrollok(stdscr, true);
    1422         */
    1423 
    14241414    WindowLog wout;
    14251415
    14261416    ReadlineColor::PrintBootMsg(wout, conf.GetName(), false);
    14271417
    1428     //log.SetWindow(stdscr);
    14291418    if (conf.Has("log"))
    14301419        if (!wout.OpenLogFile(conf.Get<string>("log")))
    … …  
    14411430    return 0;
    14421431}
     1432*/
    14431433
    14441434template<class T, class S>
    … …  
    15841574        {
    15851575            if (conf.Get<bool>("no-dim"))
    1586                 return RunDim<StateMachine>(conf);
     1576                return RunShell<LocalStream, StateMachine>(conf);
    15871577            else
    1588                 return RunDim<StateMachineDim>(conf);
     1578                return RunShell<LocalStream, StateMachineDim>(conf);
    15891579        }
    15901580        // Cosole access w/ and w/o Dim

  • trunk/FACT++/src/ftmctrl.cc

    r11043 r11056  
    17771777}
    17781778
     1779/*
    17791780template<class S, class T>
    17801781int RunDim(Configuration &conf)
    … …  
    17821783    WindowLog wout;
    17831784
    1784     /*
    1785     static Test shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    1786 
    1787     WindowLog &win  = shell.GetStreamIn();
    1788     WindowLog &wout = shell.GetStreamOut();
    1789     */
    1790 
    17911785    ReadlineColor::PrintBootMsg(wout, conf.GetName(), false);
    1792 
    17931786
    17941787    if (conf.Has("log"))
    … …  
    18041797    io_service.Run();
    18051798
    1806     /*
    1807     shell.SetReceiver(io_service);
    1808 
    1809     boost::thread t(boost::bind(RunThread, &io_service));
    1810     // boost::thread t(boost::bind(&StateMachineFTM<S>::Run, &io_service));
    1811 
    1812     shell.Run();                 // Run the shell
    1813     io_service.Stop();           // Signal Loop-thread to stop
    1814     // io_service.Close();       // Obsolete, done by the destructor
    1815 
    1816     // Wait until the StateMachine has finished its thread
    1817     // before returning and destroying the dim objects which might
    1818     // still be in use.
    1819     t.join();
    1820     */
    1821 
    18221799    return 0;
    18231800}
     1801*/
    18241802
    18251803template<class T, class S, class R>
    … …  
    19761954        {
    19771955            if (conf.Get<bool>("no-dim"))
    1978                 return RunDim<StateMachine, ConnectionFTM>(conf);
     1956                return RunShell<LocalStream, StateMachine, ConnectionFTM>(conf);
    19791957            else
    1980                 return RunDim<StateMachineDim, ConnectionDimFTM>(conf);
     1958                return RunShell<LocalStream, StateMachineDim, ConnectionDimFTM>(conf);
    19811959        }
    19821960        // Cosole access w/ and w/o Dim

  • trunk/FACT++/src/scheduler.cc

    r11043 r11056  
    738738}
    739739
     740/*
    740741template<class S>
    741742int RunDim(Configuration &conf)
    … …  
    760761    return 0;
    761762}
     763*/
    762764
    763765template<class T, class S>
    … …  
    912914        {
    913915            if (conf.Get<bool>("no-dim"))
    914                 return RunDim<StateMachine>(conf);
     916                return RunShell<LocalStream, StateMachine>(conf);
    915917            else
    916                 return RunDim<StateMachineDim>(conf);
     918                return RunShell<LocalStream, StateMachineDim>(conf);
    917919        }
    918920        // Cosole access w/ and w/o Dim
Note: See TracChangeset for help on using the changeset viewer.