- Typos

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

src/backend/pyloader/Policy.py

@@ -1,8 +1,6 @@
-
-import sgpem
 from Abstract import *
 
-class Policy(sgpem.Policy):
+class Policy:
     ## @var Avoid instantiation of an abstract class
     __metaclass__ = Metaclass
     
@@ -10,3 +8,4 @@ class Policy(sgpem.Policy):
     sort_queue = AbstractMethod('sort_queue')
     is_preemptive = AbstractMethod('is_preemptive')
     is_time_sliced = AbstractMethod('is_time_sliced')
+    

src/backend/pyloader/python_policy_manager.cc

@@ -26,8 +26,8 @@ using namespace sgpem;
 //static object
 PythonPolicyManager* PythonPolicyManager::_instance = NULL;
 
-
+PythonPolicyManager::PythonPolicyManager()
-PythonPolicyManager::PythonPolicyManager() //private constructor. The parameter is discarded
+  : _initialized(false)
 {
 }
 
@@ -35,7 +35,7 @@ PythonPolicyManager&
 PythonPolicyManager::get_instance()
 {
 	if(!_instance)
-		_instance = new PythonPolicyManager();
+	  _instance = new PythonPolicyManager();
 	return *_instance;
 }
 
@@ -49,23 +49,21 @@ PythonPolicyManager::get_policy()
 void
 PythonPolicyManager::init()
 {
-	static bool initialized = false;
+  if(_initialized)
-
+    Py_Finalize();
-	if(initialized)
+  
-		Py_Finalize();
+  Py_Initialize();
-	
+  _initialized = true;
-	Py_Initialize();
+  
-	initialized = true;
+  // The following line is ugly, but necessary if we use 
-		
+  // non-standard installation directories. Theoretically,
-	// The following line is ugly, but necessary if we use 
+  // it should be up to the user to set correct 
-	// non-standard installation directories. Theoretically,
+  // environment variables. 
-	// it should be up to the user to set correct 
+  // FIXME: find better way to achieve this.
-	// environment variables. 
+  
-	// FIXME: find better way to achieve this.
+  PyRun_SimpleString("import sys\n"
-
+		     "sys.path[:0] = [ '" MODDIR "', '" PYCDIR "' ]\n");
-	PyRun_SimpleString("import sys\n"
+  
-			"sys.path[:0] = [ '" MODDIR "', '" PYCDIR "' ]\n");
-	
 }
 
 

src/backend/pyloader/python_policy_manager.hh

@@ -30,24 +30,28 @@
 
 namespace sgpem
 {
-	//class PolicyManager;
+  //class PolicyManager;
-	class PythonPolicyManager;
+  class PythonPolicyManager;
 	
-	class SG_DLLEXPORT PythonPolicyManager : public PolicyManager
+  class SG_DLLEXPORT PythonPolicyManager : public PolicyManager
-	{
+  {
-	public:  
+  public:  	
-					
+    Policy& get_policy();
-		Policy&						get_policy();
+    void init();
-		void						init();
+    PyObject* get_py_dict();
-		PyObject*					get_py_dict();
 		
-		static PythonPolicyManager&     get_instance();	
+    static PythonPolicyManager& get_instance();	
 		
-	private:
+  private:
-		PythonPolicyManager();	       //dummy parameter
+    PythonPolicyManager();
-		static PythonPolicyManager* 	_instance;
+    PythonPolicyManager(const PythonPolicyManager&);
-		std::auto_ptr<PythonPolicy>	_python_policy;
+    PythonPolicyManager& operator=(const PythonPolicyManager&);
-	};
+
+    static PythonPolicyManager* _instance;
+    std::auto_ptr<PythonPolicy>	_python_policy;
+
+    bool _initialized;
+  };
 
 }