- Empty the main

- Delegate plugin loading to PluginManager so that it can
be tested


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@709 3ecf2c5c-341e-0410-92b4-d18e462d057c

src/main.cc

@@ -22,22 +22,11 @@
 #include "gettext.h"
 
 #include "main.hh"
+
 #include "parse_opts.hh"
-#include "start_gui.hh"
+// #include "start_gui.hh"
 
-#include "backend/history.hh"
+#include "backend/plugin_manager.hh"
-#include "backend/static_schedulable.hh"
-#include "backend/ready_queue.hh"
-#include "backend/dynamic_schedulable.hh"
-#include "backend/slice.hh"
-#include "backend/static_process.hh"
-#include "backend/policy.hh"
-#include "backend/policy_parameters.hh"
-#include "backend/global_preferences.hh"
-#include "standard_io.hh"
-#include "text_simulation.hh"
-
-#include "smartp.tcc"
 
 #include <glibmm/module.h>
 #include <glibmm/ustring.h>
@@ -49,44 +38,12 @@
 #include <string>
 #include <vector>
 
-using namespace std;
-using namespace sgpem;
-using namespace memory;
-using Glib::ustring;
-
-
-static void load_pyloader_plugin()
-{
-  // FIXME: this will need to be moved to an
-  // appropriate PluginManager class in the backend,
-  // and the Makefile fixed accordingly (partly done).
-  using Glib::Module;
-
-  // Leaks willingly:
-  Module* pyloader = 0;
-
-  GlobalPreferences& prefs = GlobalPreferences::get_instance();
-  GlobalPreferences::dir_iterator it = prefs.modules_dir_begin();
-  while(it != prefs.modules_dir_end())
-  {
-    std::string pyloader_path = Module::build_path(*it, "pyloader");
-    pyloader = new Module(pyloader_path);
-    if(*pyloader) break;
-    else delete pyloader;
-    it++;
-  }
-
-  if(!*pyloader)
-    std::cerr << Module::get_last_error() << std::endl;
-
-  // For the moment, we want to be sure it has been loaded:
-  assert(*pyloader);
-}
-
 int
 main(int argc, char* argv[])
 {
   using namespace sgpem;
+  using namespace std;
+  using Glib::ustring;
 
   // Set up gettext support
   setlocale(LC_ALL, "");
@@ -106,122 +63,8 @@ main(int argc, char* argv[])
     filenames.insert(filenames.begin(), a_ptr, a_ptr + a_count);
   }
 
-  load_pyloader_plugin();
+  // Initializes plugin system
-
+  PluginManager::get_instance();
-  // Create an INITIAL STATE
-  StaticProcess p1("P1", 0, 5, 1);
-  StaticProcess p2("P2", 0, 5, 2);
-  StaticProcess p3("P3", 5, 3, 3);
-  StaticProcess p4("P4", 6, 2, 3);
-  StaticProcess p5("P5", 1, 2, 3);
-  StaticProcess p6("P6", 10, 2, 1);
-
-  DynamicSchedulable ss1(p1);
-  DynamicSchedulable ss2(p2);
-  DynamicSchedulable ss3(p3);
-  DynamicSchedulable ss4(p4);
-  DynamicSchedulable ss5(p5);
-  DynamicSchedulable ss6(p6);
-
-  ReadyQueue initial;
-  initial.add_at_bottom(ss1);
-  initial.add_at_bottom(ss2);
-  initial.add_at_bottom(ss3);
-  initial.add_at_bottom(ss4);
-  initial.add_at_bottom(ss5);
-  initial.add_at_bottom(ss6);
-  History::get_instance().enqueue_slice(initial);
-
-  Scheduler::get_instance(); // Forces initialization of scheduler.
-  // Cross fingers (depends if PythonPolicyManager
-  // static object has been initialized before?).
-
-  //the textual simulation
-  TextSimulation text_sim;
-  History::get_instance().attach(&text_sim);
-
-  //textual IO
-  smart_ptr<IOManager> io(new StandardIO());
-  text_sim.add_io_device(io);
-  text_sim.update();
-
-  //grafical IO
-  start_gui(argc, argv, text_sim);
-
-  //SMOKE-TEST for backend classes
-  /* cout << "\n\n********************************";
-
-   
-   
-   // ************** TEST HISTORY
-   
-   ReadyQueue l1;
-   l1.add_at_top(ss1); l1.add_at_top(ss2);  l1.add_at_top(ss3);
-   
-   ReadyQueue l2;
-   l2.add_at_top(ss4); l2.add_at_top(ss5);  l2.add_at_top(ss6);
-
-   History h(History::get_instance());
-   h.enqueue_slice(l1); //stato iniziale
-   h.enqueue_slice(l2);
-   
-   smart_ptr<const sgpem::ReadyQueue> quale;
-   
-   quale = h.get_simulation_status_at(0); //stato iniziale
-   
-   cout << quale->get_item_at(0)->get_schedulable()->get_name();
-   smart_ptr<const sgpem::DynamicSchedulable> quale2 = h.get_scheduled_at(1);
-   cout << quale2->get_schedulable()->get_name();
-     
-   h.truncate_at(0);
-   quale = h.get_simulation_status_at(0); //stato iniziale
-   
-   cout << bool(quale) << "  " << quale->get_item_at(0)->get_schedulable()->get_name();
-    */
-  /*
-  smart_ptr<const sgpem::SimulationStatus> quale;
-
-  quale = h.get_simulation_status_at(0);
-  if (quale)  cout << "\n" << quale->get_running()->get_schedulable()->get_name(); else cout << "NO";
-  quale = h.get_simulation_status_at(1);
-  if (quale)  cout << "\n" << quale->get_running()->get_schedulable()->get_name(); else cout << "NO";
-  quale = h.get_simulation_status_at(2);
-  if (quale)  cout << "\n" << quale->get_running()->get_schedulable()->get_name(); else cout << "NO";
-
-  h.truncate_at(2);
-
-  smart_ptr<const sgpem::DynamicSchedulable> quale2;
-  quale2 = h.get_scheduled_at(0);
-  if (quale2) cout << "\n" << quale2->get_schedulable()->get_name(); else cout << "NO";
-  quale2 = h.get_scheduled_at(1);
-  if (quale2) cout << "\n" << quale2->get_schedulable()->get_name(); else cout << "NO";
-  quale2 = h.get_scheduled_at(2);
-  if (quale2) cout << "\n" << quale2->get_schedulable()->get_name(); else cout << "NO";
-  */
-
-  //************** TEST QUEUE
-  /* cout << "\n\nTEST QUEUE\n";
-   
-   ReadyQueue sq;
-   sq.add_at_bottom(ss1);
-   sq.add_at_bottom(ss2);
-   sq.add_at_bottom(ss3);
-   cout << sq.get_item_at(0)->get_schedulable()->get_name() << "\n";
-   cout << sq.get_item_at(1)->get_schedulable()->get_name() << "\n";
-   cout << sq.get_item_at(2)->get_schedulable()->get_name() << "\n";
-   sq.insert_at(2,0);
-   cout << sq.get_item_at(0)->get_schedulable()->get_name() << "\n";
-   cout << sq.get_item_at(1)->get_schedulable()->get_name() << "\n";
-   cout << sq.get_item_at(2)->get_schedulable()->get_name() << "\n";
-
-   cout << "\n\nTEST POLICYPARAMETERS\n";
-   PolicyParameters pp;
-   pp.register_int("ciao", 0, 100, true, 50);
-   pp.set_int("ciao",1);
-   cout << pp.get_int("ciao");
-   
-   cout << "\n\n";
-   */
 
   return 0;
 }