- Add missing files

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

src/backend/Makefile.am

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

src/backend/pyloader/Abstract.py

@@ -0,0 +1,94 @@
+class AbstractMethod (object):
+    """Defines a class to create abstract methods
+
+    @example:
+        class Foo:
+            foo = AbstractMethod('foo')
+    """
+    def __init__(self, func):
+        """Constructor
+
+        @params func: name of the function (used when raising an
+            exception).
+        @type func: str
+        """
+        self._function = func
+
+    def __get__(self, obj, type):
+        """Get callable object
+
+        @returns An instance of AbstractMethodHelper.
+
+        This trickery is needed to get the name of the class for which
+        an abstract method was requested, otherwise it would be
+        sufficient to include a __call__ method in the AbstractMethod
+        class itself.
+        """
+        return self.AbstractMethodHelper(self._function, type)
+
+    class AbstractMethodHelper (object):
+        """Abstract method helper class
+
+        An AbstractMethodHelper instance is a callable object that
+        represents an abstract method.
+        """
+        def __init__(self, func, cls):
+            self._function = func
+            self._class = cls
+
+        def __call__(self, *args, **kwargs):
+            """Call abstract method
+
+            Raises a TypeError, because abstract methods can not be
+            called.
+            """
+            raise TypeError('Abstract method `' + self._class.__name__ \
+                            + '.' + self._function + '\' called')
+
+
+class Metaclass (type):
+    def __init__(cls, name, bases, *args, **kwargs):
+        """Configure a new class
+
+        @param cls: Class object
+        @param name: Name of the class
+        @param bases: All base classes for cls
+        """
+        super(Metaclass, cls).__init__(cls, name, bases, *args, **kwargs)
+
+        # Detach cls.new() from class Metaclass, and make it a method
+        # of cls.
+        cls.__new__ = staticmethod(cls.new)
+
+        # Find all abstract methods, and assign the resulting list to
+        # cls.__abstractmethods__, so we can read that variable when a
+        # request for allocation (__new__) is done.
+        abstractmethods = []
+        ancestors = list(cls.__mro__)
+        ancestors.reverse()  # Start with __builtin__.object
+        for ancestor in ancestors:
+            for clsname, clst in ancestor.__dict__.items():
+                if isinstance(clst, AbstractMethod):
+                    abstractmethods.append(clsname)
+                else:
+                    if clsname in abstractmethods:
+                        abstractmethods.remove(clsname)
+
+        abstractmethods.sort()
+        setattr(cls, '__abstractmethods__', abstractmethods)
+
+    def new(self, cls):
+        """Allocator for class cls
+
+        @param self: Class object for which an instance should be
+            created.
+
+        @param cls: Same as self.
+        """
+        if len(cls.__abstractmethods__):
+            raise NotImplementedError('Can\'t instantiate class `' + \
+                                      cls.__name__ + '\';\n' + \
+                                      'Abstract methods: ' + \
+                                      ", ".join(cls.__abstractmethods__))
+
+        return object.__new__(self)

src/backend/pyloader/Makefile.am

@@ -0,0 +1,58 @@
+# src/pyloader/Makefile.am - 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
+
+# you'll want to setup a testsuite for this component, sooner or later.
+#SUBDIRS = testsuite
+
+#additional rules:
+%_wrap.cc : %.i
+	$(SWIG) $(SWIG_PYTHON_OPT) -o $@  $<
+
+# Program & library names
+pkglib_LTLIBRARIES = libpyloader.la
+
+# Other directories
+sharedir = $(pkgdatadir)
+pycdir = $(sharedir)/policies
+moddir = $(sharedir)/modules
+localedir = @datadir@/locale
+
+libpyloader_la_CPPFLAGS = -I@top_srcdir@ \
+		-DPYCDIR="\"$(pycdir)\"" \
+		-DMODDIR="\"$(moddir)\"" \
+		-DLOCALEDIR="\"$(localedir)\"" \
+		$(PYTHON_CPPFLAGS) \
+		$(GLIBMM_CFLAGS)
+libpyloader_la_LIBADD = $(PYTHON_LDFLAGS) \
+		$(PYTHON_EXTRA_LIBS) \
+		$(GLIBMM_LIBS)
+libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
+		$(LT_LDFLAGS) 
+
+# Please keep this in sorted order:
+libpyloader_la_SOURCES = \
+		python_policy.cc \
+		python_policy_manager.cc
+
+noinst_HEADERS = python_policy.hh \
+		python_policy_manager.hh
+
+mod_PYTHON = Abstract.py \
+		Policy.py

src/backend/pyloader/Policy.py

@@ -0,0 +1,15 @@
+
+''' from sgpem import SchedulableQueue, PolicyParameters '''
+from Abstract import *
+
+class Policy:
+    '''
+    Avoid instantiation of an abstract class.
+    '''
+    __metaclass__ = Metaclass
+    
+    configure = AbstractMethod('configure')
+    sort_queue = AbstractMethod('sort_queue')
+    is_preemptive = AbstractMethod('is_preemptive')
+    is_time_sliced = AbstractMethod('is_time_sliced')
+    get_parameters = AbstractMethod('get_parameters')

src/backend/pyloader/python_policy.cc

@@ -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()
+{
+}

src/backend/pyloader/python_policy.hh

@@ -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

src/backend/pyloader/python_policy_manager.cc

@@ -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");
+	
+}
+
+

src/backend/pyloader/python_policy_manager.hh

@@ -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