- Incapsulate code so that the hack we previously used in CPUPoliciesGatekeeper isn't needed anymore

- Now CPUPolicy has a callback method for scripting languages, but it is up to derived classes to take
mutexes and set the value when needed (maybe we can improve this?)


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

plugins/pyloader/src/python_cpu_policy.cc

@@ -29,6 +29,11 @@ using namespace std;
 
 #define WAIT_FOR (250000)
 
+
+// Static member data
+Glib::StaticRecMutex PythonCPUPolicy::_mtx = GLIBMM_STATIC_REC_MUTEX_INIT;
+
+
 // WARNING :  this class needs extensive and above all
 // *strong* exception checking / handling!
 
@@ -89,19 +94,29 @@ PythonCPUPolicy::~PythonCPUPolicy()
 void
 PythonCPUPolicy::activate() throw(UserInterruptException, MalformedPolicyException)
 {
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   // FIXME write the rest, taking away code from constructor
 
   configure();
+  
+  set_callback_policy(NULL);
 }
 
 
 void
 PythonCPUPolicy::deactivate()
 {
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   // FIXME See if some code has to be moved here from the
   // destructor, AFTER having written activate()
 
   _parameters.clear();
+
+  set_callback_policy(NULL);
 }
 
 
@@ -109,16 +124,24 @@ PythonCPUPolicy::deactivate()
 void
 PythonCPUPolicy::configure() throw(UserInterruptException, MalformedPolicyException)
 {
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   PyObject* retval = PyObject_CallMethod(_adapter, "async_configure", NULL);
   Py_DECREF(retval);
 
   wait_unlock();
+
+  set_callback_policy(NULL);
 }
 
 
 void
 PythonCPUPolicy::sort_queue() const throw(UserInterruptException, MalformedPolicyException)
-{
+{  
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   PyObject* retval = PyObject_CallMethod(_adapter, "async_sort_queue", NULL);
 
   // Do minimal debugging
@@ -126,6 +149,8 @@ PythonCPUPolicy::sort_queue() const throw(UserInterruptException, MalformedPolic
   else Py_DECREF(retval);
 
   wait_unlock();
+
+  set_callback_policy(NULL);
 }
 
 
@@ -145,6 +170,9 @@ PythonCPUPolicy::get_name() const
 bool
 PythonCPUPolicy::is_pre_emptive() const throw(UserInterruptException, MalformedPolicyException)
 {
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   PyObject* retval = PyObject_CallMethod(_adapter, "async_is_preemptive", NULL);
   Py_DECREF(retval);
 
@@ -155,6 +183,8 @@ PythonCPUPolicy::is_pre_emptive() const throw(UserInterruptException, MalformedP
   assert(retval);
   bool ret = PyObject_IsTrue(retval);
   Py_DECREF(retval);
+
+  set_callback_policy(NULL);
   return ret;
 }
 
@@ -162,6 +192,9 @@ PythonCPUPolicy::is_pre_emptive() const throw(UserInterruptException, MalformedP
 int
 PythonCPUPolicy::get_time_slice() const throw(UserInterruptException, MalformedPolicyException)
 {
+  Glib::RecMutex::Lock lock(_mtx);;
+  set_callback_policy(const_cast<PythonCPUPolicy*>(this));
+
   PyObject* retval = PyObject_CallMethod(_adapter, "async_get_time_slice", NULL);
 
   // Do minimal debugging
@@ -176,6 +209,7 @@ PythonCPUPolicy::get_time_slice() const throw(UserInterruptException, MalformedP
   long tmp = PyInt_AsLong(retval);
   Py_DECREF(retval);
 
+  set_callback_policy(NULL);
   return tmp < 0 ? numeric_limits<int>::max() : static_cast<int>(tmp);
 }
 
@@ -208,7 +242,7 @@ PythonCPUPolicy::wait_unlock() const throw(UserInterruptException, MalformedPoli
       PyEval_RestoreThread(_save);
 
       if(PyErr_Occurred() != NULL)
-	abort();
+        abort();
     
       throw UserInterruptException(_("User-defined policy is "
                                      "taking too long to terminate."));