Merging the frsh_sa branch in the trunk.

Now we use the new service thread and the scenario structures for
schedulling analysis

git-svn-id: http://www.frescor.org/private/svn/frescor/frsh/trunk/include@1193 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/frsh_configuration_parameters.h b/frsh_configuration_parameters.h
index 58d8358d49a6b66303e26f41ac2d811c8fbec80c..b60fa159bc8309c2b5a8df6ceeb37aba45996b6e 100644 (file)
--- a/frsh_configuration_parameters.h
+++ b/frsh_configuration_parameters.h
@@ -127,7 +127,7 @@ FRSH_CPP_BEGIN_DECLS
  **/
 
 /** Maximum number of accepted contracts (vres) **/
-#define FRSH_MAX_N_VRES                    125
+#define FRSH_MAX_N_VRES                    100
 
 
 /** Maximum number of threads that may be scheduled by the framework **/
@@ -138,7 +138,7 @@ FRSH_CPP_BEGIN_DECLS
  * Maximum number of critical sections that can be stored in a
  * contract parameters object
  **/
-#define FRSH_MAX_N_CRITICAL_SECTIONS          25
+#define FRSH_MAX_N_CRITICAL_SECTIONS          10
 
 /**
  * Maximum number of memory areas that can be specified for a
@@ -246,7 +246,7 @@ FRSH_CPP_BEGIN_DECLS
  **/
 
 /** Initial period of the service thread (timespec) **/
-#define FRSH_SERVICE_THREAD_PERIOD_USECS 5000000 /* 5 secs */
+#define FRSH_SERVICE_THREAD_PERIOD_USECS 500000 /* 500 msecs */
 
 /** Initial budget of the service thread (timespec) **/
 #define FRSH_SERVICE_THREAD_BUDGET_USECS 1000 /* 1 msec */
@@ -257,7 +257,8 @@ FRSH_CPP_BEGIN_DECLS
  * expected response times for reconfiguration or tunning of the
  * system.
  **/
-#define FRSH_SERVICE_THREAD_PRIORITY          (FRSH_LOWEST_THREAD_PRIORITY+1) //3 3    //3 1
+//#define FRSH_SERVICE_THREAD_PRIORITY          (FRSH_LOWEST_THREAD_PRIORITY+1)
+#define FRSH_SERVICE_THREAD_PRIORITY          0
 
 
 /*@}*/

diff --git a/frsh_core.h b/frsh_core.h
index 0440e4bee6baf18b6ce29623d312177cf3449529..f0a8a5fd719f8f836733fe4c089f0bb32958f1a8 100644 (file)
--- a/frsh_core.h
+++ b/frsh_core.h
@@ -938,6 +938,28 @@ int frsh_thread_unbind(const frsh_thread_id_t thread);
 int frsh_thread_get_vres_id(const frsh_thread_id_t       thread,
                     frsh_vres_id_t *vres_id);
 
+/**
+ * frsh_vres_get_priority()
+ *
+ * This operation stores the priority currently associated
+ * with the specified vres in the variable pointed to by
+ * priority. It returns an error if the vres_id is not recognised.
+ *
+ * @return 0 if no error \n
+ *   FRSH_ERR_BAD_ARGUMENT :  if the contract argument is NULL or the value
+ *     of the vres argument is not in range \n
+ *   FRSH_ERR_NOT_SCHEDULED_CALLING_THREAD : if the calling thread is not
+ *     scheduled under FRSH \n
+ *   FRSH_ERR_INVALID_SCHEDULER_REPLY : the scheduler is wrong or not
+ *        running \n
+ *   FRSH_ERR_NOT_CONTRACTED_VRES: if the vres of the calling thread
+ *     has been cancelled or it is not valid
+ *
+ **/
+int frsh_vres_get_priority
+     (frsh_vres_id_t            vres_id,
+      int *priority);
+
 /**
  * frsh_vres_get_contract()
  *

diff --git a/frsh_time.h b/frsh_time.h
index b84612c730146f06fbad2836a0590aabde20e719..bfd691bcb99f638ef20dd050cff851e6a385b1cf 100644 (file)
--- a/frsh_time.h
+++ b/frsh_time.h
@@ -184,7 +184,7 @@ static inline frsh_rel_time_t frsh_rel_time_decr(frsh_rel_time_t total, frsh_rel
  */
 static inline frsh_rel_time_t frsh_abs_time_extract_interval(frsh_abs_time_t past, frsh_abs_time_t future)
 {
-    return frsh_abs_time_extract_interval(past, future);
+    return fosa_abs_time_extract_interval(past, future);
 }
 
 /**