- Add missing files

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@338 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-02-17 16:08:54 +00:00
parent 74df8ba0d2
commit 3ba6b90f30
10 changed files with 216 additions and 11 deletions

View File

@ -18,7 +18,7 @@
# along with SGPEMv2; if not, write to the Free Software # along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = backend builtin-policies pyloader testsuite SUBDIRS = backend builtin-policies testsuite
#additional rules: #additional rules:
%_wrap.cc : %.i %_wrap.cc : %.i
@ -41,7 +41,6 @@ sgpemv2_CPPFLAGS = -I@top_srcdir@ \
$(GTKMM_CFLAGS) \ $(GTKMM_CFLAGS) \
$(PYTHON_CPPFLAGS) $(PYTHON_CPPFLAGS)
sgpemv2_LDFLAGS = -L@builddir@/backend \ sgpemv2_LDFLAGS = -L@builddir@/backend \
-L@builddir@/pyloader \
$(LT_LDFLAGS) $(LT_LDFLAGS)
sgpemv2_LDADD = -lbackend \ sgpemv2_LDADD = -lbackend \
$(CAIRO_LIBS) \ $(CAIRO_LIBS) \

View File

@ -20,14 +20,12 @@
# you'll want to setup a testsuite for this component, sooner or later. # you'll want to setup a testsuite for this component, sooner or later.
#SUBDIRS = testsuite #SUBDIRS = testsuite
SUBDIRS = pyloader
#additional rules: #additional rules:
%_wrap.cc : %.i %_wrap.cc : %.i
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $< $(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
../pyloader/libpyloader.la :
make -C ../pyloader libpyloader.la
# Program & library names # Program & library names
pkglib_LTLIBRARIES = libbackend.la pkglib_LTLIBRARIES = libbackend.la
@ -43,9 +41,9 @@ libbackend_la_CPPFLAGS = -I@top_srcdir@ \
-DLOCALEDIR="\"$(localedir)\"" \ -DLOCALEDIR="\"$(localedir)\"" \
$(PYTHON_CPPFLAGS) \ $(PYTHON_CPPFLAGS) \
$(GLIBMM_CFLAGS) $(GLIBMM_CFLAGS)
libbackend_la_LIBADD = ../pyloader/libpyloader.la libbackend_la_LIBADD = -lpyloader
libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \ libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \
$(LT_LDFLAGS) $(LT_LDFLAGS) -L@builddir@/pyloader/
# Please keep this in sorted order: # Please keep this in sorted order:
libbackend_la_SOURCES = \ libbackend_la_SOURCES = \

View File

@ -0,0 +1,27 @@
// src/backend/python_policy.cc - Copyright 2005, 2006, University
// of Padova, dept. of Pure and Applied
// Mathematics
//
// This file is part of SGPEMv2.
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// SGPEMv2 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with SGPEMv2; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "python_policy.hh"
using namespace sgpem;
using namespace std;
PythonPolicy::PythonPolicy()
{
}

View File

@ -0,0 +1,60 @@
// src/backend/python_policy.hh - Copyright 2005, 2006, University
// of Padova, dept. of Pure and Applied
// Mathematics
//
// This file is part of SGPEMv2.
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// SGPEMv2 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with SGPEMv2; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef PYTHON_POLICY_HH
#define PYTHON_POLICY_HH 1
#include "config.h"
#include <Python.h>
#include <glibmm/ustring.h>
#include <iostream>
#include "../policy.hh"
namespace sgpem
{
class PythonPolicy;
class PythonPolicyManager;
class SG_DLLEXPORT PythonPolicy : public Policy
{
public:
//only PythonPolicyManager can create a PythonPolicy object
friend class PythonPolicyManager;
void configure() {}
void sort_queue(sgpem::Scheduler::event) const {}
Glib::ustring get_description() const {}
bool is_pre_emptive() const {}
int get_time_slice() const {}
void set_time_slice(const int&) {}
private:
PythonPolicy();
PythonPolicy(const PythonPolicy&);
PythonPolicy& operator=(const PythonPolicy&);
};
}
#endif

View File

@ -0,0 +1,71 @@
// src/backend/python_policy_manager.cc - Copyright 2005, 2006, University
// of Padova, dept. of Pure and Applied
// Mathematics
//
// This file is part of SGPEMv2.
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// SGPEMv2 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with SGPEMv2; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "python_policy_manager.hh"
using namespace sgpem;
//static object
PythonPolicyManager* PythonPolicyManager::_instance = NULL;
PythonPolicyManager::PythonPolicyManager() //private constructor. The parameter is discarded
{
}
PythonPolicyManager&
PythonPolicyManager::get_instance()
{
if(!_instance)
_instance = new PythonPolicyManager();
return *_instance;
}
Policy&
PythonPolicyManager::get_policy()
{
// FIXME : assumes that _python_policy is always != NULL!
return *_python_policy;
}
void
PythonPolicyManager::init()
{
static bool initialized = false;
if(initialized)
Py_Finalize();
Py_Initialize();
initialized = true;
// The following line is ugly, but necessary if we use
// non-standard installation directories. Theoretically,
// it should be up to the user to set correct
// environment variables.
// FIXME: find better way to achieve this.
PyRun_SimpleString("import sys\n"
"sys.path[:0] = [ '" MODDIR "', '" PYCDIR "' ]\n");
}

View File

@ -0,0 +1,54 @@
// src/backend/python_policy_manager.hh - Copyright 2005, 2006, University
// of Padova, dept. of Pure and Applied
// Mathematics
//
// This file is part of SGPEMv2.
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// SGPEMv2 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with SGPEMv2; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef PYTHON_POLICY_MANAGER_HH
#define PYTHON_POLICY_MANAGER_HH 1
#include "config.h"
#include <Python.h>
#include "../policy_manager.hh"
#include "python_policy.hh"
namespace sgpem
{
//class PolicyManager;
class PythonPolicyManager;
class SG_DLLEXPORT PythonPolicyManager : public PolicyManager
{
public:
Policy& get_policy();
void init();
PyObject* get_py_dict();
static PythonPolicyManager& get_instance();
private:
PythonPolicyManager(); //dummy parameter
static PythonPolicyManager* _instance;
std::auto_ptr<PythonPolicy> _python_policy;
};
}
#endif

View File

@ -34,8 +34,6 @@
#include "backend/process.hh" #include "backend/process.hh"
#include "backend/policy.hh" #include "backend/policy.hh"
#include "backend/policy_parameters.hh" #include "backend/policy_parameters.hh"
#include "pyloader/python_policy.hh"
#include "pyloader/python_policy_manager.hh"
#include "standard_io.hh" #include "standard_io.hh"
#include <glibmm/timer.h> #include <glibmm/timer.h>
@ -72,8 +70,6 @@ main(int argc, char* argv[])
*/ */
//start_gui(argc, argv); //start_gui(argc, argv);
PythonPolicyManager& p = PythonPolicyManager::get_instance();
p.init();
StandardIO io; StandardIO io;
io.write_buffer("\nciao!!"); io.write_buffer("\nciao!!");
ustring ss = io.read_command(); ustring ss = io.read_command();