forced merge on starpu_top.h

include/starpu_top.h

@@ -17,24 +17,24 @@
 
 #ifndef __STARPU_TOP_H__
 #define __STARPU_TOP_H__
-
-#include <starpu.h>
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>
+#include <starpu.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-enum starpu_top_data_type
+ 
+typedef enum
 {
-	STARPU_TOP_DATA_BOOLEAN,
-	STARPU_TOP_DATA_INTEGER,
-	STARPU_TOP_DATA_FLOAT
-};
+	STARPUTOP_DATA_BOOLEAN,
+	STARPUTOP_DATA_INTEGER,
+	STARPUTOP_DATA_FLOAT
+} starputop_data_type;
 
-struct starpu_top_data
+typedef struct starputop_data_t
 {
 	unsigned int id;
 	const char* name;
@@ -43,35 +43,35 @@ struct starpu_top_data
 	double double_min_value;
 	double double_max_value;
 	int active;
-	enum starpu_top_data_type type;
-	struct starpu_top_data * next;
-};
+	starputop_data_type type;
+	struct starputop_data_t * next;
+} starputop_data;
 
-enum starpu_top_param_type
+typedef enum
 {
-	STARPU_TOP_PARAM_BOOLEAN,
-	STARPU_TOP_PARAM_INTEGER,
-	STARPU_TOP_PARAM_FLOAT,
-	STARPU_TOP_PARAM_ENUM
-};
+	STARPUTOP_PARAM_BOOLEAN,
+	STARPUTOP_PARAM_INTEGER,
+	STARPUTOP_PARAM_FLOAT,
+	STARPUTOP_PARAM_ENUM
+} starputop_param_type;
 
-struct starpu_top_param
+typedef struct starputop_param_t
 {
 	unsigned int id;
 	const char* name;
-	enum starpu_top_param_type type;
+	starputop_param_type type;
 	void* value;
 	char** enum_values; /* only for enum type can be NULL */
 	int nb_values;
-	void (*callback)(struct starpu_top_param*);
+	void (*callback)(struct starputop_param_t*);
 	int int_min_value; /* only for integer type */
 	int int_max_value;
 	double double_min_value; /*only for double type */
 	double double_max_value;
-	struct starpu_top_param * next;
-};
+	struct starputop_param_t * next;
+} starputop_param;
 
-enum starpu_top_message_type
+typedef enum
 {
 	TOP_TYPE_GO,
 	TOP_TYPE_SET,
@@ -79,8 +79,19 @@ enum starpu_top_message_type
 	TOP_TYPE_ENABLE,
 	TOP_TYPE_DISABLE,
 	TOP_TYPE_DEBUG,
-	TOP_TYPE_UNKNOW
-};
+	TOP_TYPE_UNKNOW	
+} starputop_message_type;
+
+
+/* 
+ * This function returns 1 if starpu_top is initialized. 0 otherwise.
+ */
+int starpu_top_status_get();
+
+/*
+ * Convert timespec to ms
+ */
+unsigned long long starpu_timing_timespec_to_ms(const struct timespec *ts);
 
 /*****************************************************
 ****   Functions to call BEFORE initialisation   *****
@@ -90,49 +101,52 @@ enum starpu_top_message_type
  * If active=0, the value will NOT be displayed to user by default.
  * Any other value will make the value displayed by default.
 */
-struct starpu_top_data *starpu_top_add_data_boolean(const char* data_name,
-						    int active);
+starputop_data * starputop_add_data_boolean(
+			const char* data_name,
+			int active);
 /*
  * This fonction register a data named data_name of type integer
  * The minimum and maximum value will be usefull to define the scale in UI
  * If active=0, the value will NOT be displayed to user by default.
  * Any other value will make the value displayed by default.
 */
-struct starpu_top_data * starpu_top_add_data_integer(const char* data_name,
-						     int minimum_value,
-						     int maximum_value,
-						     int active);
+starputop_data * starputop_add_data_integer(
+			const char* data_name, 
+			int minimum_value, 
+			int maximum_value, 
+			int active);
 /*
  * This fonction register a data named data_name of type float
  * The minimum and maximum value will be usefull to define the scale in UI
  * If active=0, the value will NOT be displayed to user by default.
  * Any other value will make the value displayed by default.
 */
-struct starpu_top_data* starpu_top_add_data_float(const char* data_name,
-						  double minimum_value,
-						  double maximum_value,
-						  int active);
+starputop_data* starputop_add_data_float(const char* data_name, 
+			double minimum_value, 
+			double maximum_value, 
+			int active);
 
 /*
  * This fonction register a parameter named parameter_name, of type boolean.
- * The callback fonction will be called when the parameter is modified by UI,
+ * The callback fonction will be called when the parameter is modified by UI, 
  * and can be null.
 */
-struct starpu_top_param* starpu_top_register_parameter_boolean(const char* param_name,
-							       int* parameter_field,
-							       void (*callback)(struct starpu_top_param*));
+starputop_param* starputop_register_parameter_boolean(
+			const char* param_name, 
+			int* parameter_field, 
+			void (*callback)(struct starputop_param_t*));
 /*
  * This fonction register a parameter named param_name, of type integer.
  * Minimum and maximum value will be used to prevent user seting incorrect
  * value.
- * The callback fonction will be called when the parameter is modified by UI,
+ * The callback fonction will be called when the parameter is modified by UI, 
  * and can be null.
 */
-struct starpu_top_param* starpu_top_register_parameter_integer(const char* param_name,
-							       int* parameter_field,
-							       int minimum_value,
-							       int maximum_value,
-							       void (*callback)(struct starpu_top_param*));
+starputop_param* starputop_register_parameter_integer(const char* param_name, 
+			int* parameter_field, 
+			int minimum_value, 
+			int maximum_value,
+			void (*callback)(struct starputop_param_t*));
 /*
  * This fonction register a parameter named param_name, of type float.
  * Minimum and maximum value will be used to prevent user seting incorrect
@@ -140,11 +154,12 @@ struct starpu_top_param* starpu_top_register_parameter_integer(const char* param
  * The callback fonction will be called when the parameter is modified by UI,
  * and can be null.
 */
-struct starpu_top_param* starpu_top_register_parameter_float(const char* param_name,
-							     double* parameter_field,
-							     double minimum_value,
-							     double maximum_value,
-							     void (*callback)(struct starpu_top_param*));
+starputop_param* starputop_register_parameter_float(
+			const char* param_name, 
+			double* parameter_field, 
+			double minimum_value, 
+			double maximum_value, 
+			void (*callback)(struct starputop_param_t*));
 
 /*
  * This fonction register a parameter named param_name, of type enum.
@@ -153,11 +168,12 @@ struct starpu_top_param* starpu_top_register_parameter_float(const char* param_n
  * The callback fonction will be called when the parameter is modified by UI,
  * and can be null.
 */
-struct starpu_top_param* starpu_top_register_parameter_enum(const char* param_name,
-							    int* parameter_field,
-							    char** values,
-							    int nb_values,
-							    void (*callback)(struct starpu_top_param*));
+starputop_param* starputop_register_parameter_enum(
+			const char* param_name, 
+			int* parameter_field, 
+			char** values,
+			int nb_values, 
+			void (*callback)(struct starputop_param_t*));
 
 
 
@@ -171,7 +187,7 @@ struct starpu_top_param* starpu_top_register_parameter_enum(const char* param_na
  * This function will wait for a TOP to connect, send initialisation
  * sentences, and wait for the GO message.
  */
-void starpu_top_init_and_wait(const char* server_name);
+void starputop_init_and_wait(const char* server_name);
 
 /****************************************************
 ************ To call after initialisation************
@@ -181,33 +197,71 @@ void starpu_top_init_and_wait(const char* server_name);
  * This function should be called after every modification
  * of a parameter from something other than starpu_top.
  * This fonction notice UI that the configuration changed
+ */ 
+void starputop_update_parameter(const starputop_param* param);
+
+/*
+ * This functions update the value of the starputop_data on UI
  */
-void starpu_top_update_parameter(const struct starpu_top_param* param);
+void starputop_update_data_boolean(
+			const starputop_data* data, 
+			int value);
+void starputop_update_data_integer(
+			const starputop_data* data, 
+			int value);
+void starputop_update_data_float(
+			const starputop_data* data, 
+			double value);
 
 /*
- * This functions update the value of the starpu_top_data on UI
+ * This functions notify UI than the task has started or ended
+ */
+void starputop_task_started(
+			struct starpu_task *task, 
+			int devid, 
+			const struct timespec* ts);
+void starputop_task_ended(
+			struct starpu_task *task, 
+			int devid, 
+			const struct timespec* ts );
+/*
+ * This functions notify UI than the task have been planed to 
+ * run from timestamp_begin to timestamp_end, on computation-core
  */
-void starpu_top_update_data_boolean(const struct starpu_top_data* data,
-				    int value);
-void starpu_top_update_data_integer(const struct starpu_top_data* data,
-				    int value);
-void starpu_top_update_data_float(const struct starpu_top_data* data,
-				  double value);
+void starputop_task_prevision_timespec(
+			struct starpu_task *task, 
+			int devid, 
+			const struct timespec* start, 
+			const struct timespec* end);
+void starputop_task_prevision(
+			struct starpu_task *task, 
+			int devid, unsigned long long start, 
+			unsigned long long end);
 
+ 
 /*
  * This functions are usefull in debug mode. The starpu developper doesn't need
  * to check if the debug mode is active.
- * This is checked by starpu_top itsefl.
- *
+ * This is checked by starputop itsefl.
+ * 
  * top_debug_log just send a message to display by UI
- * top_debug_lock send a message and wait for a continue message from UI
+ * top_debug_lock send a message and wait for a continue message from UI 
  * to return
- *
+ * 
  * The lock (wich create a stop-point) should be called only by the main thread.
  * Calling it from more than one thread is not supported.
  */
-void starpu_top_debug_log(const char* message);
-void starpu_top_debug_lock(const char* message);
+void starputop_debug_log(const char* message);
+void starputop_debug_lock(const char* message);
+
+/****************************************************
+***************** Callback function *****************
+*****************************************************/
+
+void starputop_process_input_message(char *message);
+	
+	
+
 
 #ifdef __cplusplus
 }