Merge of the synchronized workload changes

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

diff --git a/frsh_configuration_parameters.h b/frsh_configuration_parameters.h
index 595cb765ace6fc40a545c2ba23b0caeced48fb31..d5b1d25a728af64c0b1224fe2ccf690275f4c43f 100644 (file)
--- a/frsh_configuration_parameters.h
+++ b/frsh_configuration_parameters.h
@@ -69,6 +69,7 @@
 #define _FRSH_CONFIGURATION_PARAMETERS_H_
 
 #include <unistd.h>
+#include <limits.h>
 #include <frsh_cpp_macros.h>
 
 FRSH_CPP_BEGIN_DECLS
@@ -354,6 +355,13 @@ int frsh_priority_map (unsigned long plevel);
 /* Default memory pool's size in Kbytes */
 #define FRSH_DYNAMIC_MEMORY_POOL_SIZE 6670
 
+/**
+ * Maximum synchronized workload period number.  After this value any
+ * increments will be set to zero.
+ **/
+#define FRSH_MAX_SYNCHRONIZED_PERIOD_NUMBER LONG_MAX
+
+
 /*@}*/
 
 /*@}*/

diff --git a/frsh_core.h b/frsh_core.h
index 9f323d51369b9a3f81c4b152f18028181a5bbdcd..0ad8b2af3f0b13f95af2551b58c9a77acb9bfa8b 100644 (file)
--- a/frsh_core.h
+++ b/frsh_core.h
@@ -672,15 +672,17 @@ int frsh_timed_wait
  * frsh_vresperiod_wait()
  *
  * Suspend the calling thread until the start of the specified virtual
- * resource period, for a synchronized workload.
+ * resource period of a vres_id, for a synchronized workload.
  *
  * Virtual resource periods are numbered. The number of the current
  * period can be obtained through the frsh_vres_get_period_number()
  * operation.
  **/
-int frsh_vresperiod_wait
-   (const frsh_vres_id_t vres,
-    long period_num);
+int frsh_vresperiod_wait(unsigned long period_num,
+                         frsh_rel_time_t       *next_budget,
+                         frsh_rel_time_t       *next_period,
+                         bool                  *was_deadline_missed,
+                         bool                  *was_budget_overran);
 
 
 /**

diff --git a/frsh_debug_and_trace.h b/frsh_debug_and_trace.h
index 5ccb17520a83e84ba1e3fa97862a52fe7f83bdf8..edc00f8897646a6d8c3f16924dcb4aedfe773353 100644 (file)
--- a/frsh_debug_and_trace.h
+++ b/frsh_debug_and_trace.h
@@ -89,7 +89,7 @@ FRSH_CPP_BEGIN_DECLS
 #define FRSH_TRACE_REPLENISHMENTS false
 #define FRSH_TRACE_ROUND_ROBIN false
 #define FRSH_TRACE_BOUNDED_JOB false
-
+#define FRSH_TRACE_SYNCHRONIZE_WORKLOAD false
 #define FRSH_TRACE_ADMISSION_TEST false
 #define FRSH_TRACE_ADMISSION_RESULT false