Revert "Adding the prototype for the callback on startup mechanism."

This reverts commit 0eb7621025a933db4ac7fbbec8e4646dd8bc279e.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4759 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index eace0c2..d81c773 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -140,8 +140,6 @@ typedef struct surf_model_public {
   int (*is_suspended) (surf_action_t action); /**< Return whether an action is suspended */
   void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/
   void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */
   int (*is_suspended) (surf_action_t action); /**< Return whether an action is suspended */
   void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/
   void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */

-  void (*set_callback) (void *resource, void value, void *function, void *arg);
-  int (*get_callback)  (void **resource, void *value, void **function, void **arg);

   const char *name; /**< Name of this model */
 } s_surf_model_public_t, *surf_model_public_t;
 
   const char *name; /**< Name of this model */
 } s_surf_model_public_t, *surf_model_public_t;
 

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index dcb1507..8abcbcb 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -318,16 +318,6 @@ static void action_set_priority(surf_action_t action, double priority)
   XBT_OUT;
 }
 
   XBT_OUT;
 }
 

-
-static void (*set_callback) (void *resource, void value, void *function, void *arg)
-{
-}
-
-static int (*get_callback)  (void **resource, void *value, void **function, void **arg)
-{
-  return 0;
-}
-

 static e_surf_cpu_state_t get_state(void *cpu)
 {
   return ((cpu_Cas01_t) cpu)->state_current;
 static e_surf_cpu_state_t get_state(void *cpu)
 {
   return ((cpu_Cas01_t) cpu)->state_current;


@@ -414,11 +404,9 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->common_public->set_max_duration =
       action_set_max_duration;
   surf_cpu_model->common_public->set_priority = action_set_priority;
   surf_cpu_model->common_public->set_max_duration =
       action_set_max_duration;
   surf_cpu_model->common_public->set_priority = action_set_priority;

-  surf_cpu_model->common_public->set_callback = set_callback;
-  surf_cpu_model->common_public->get_callback = get_callback;
-

   surf_cpu_model->extension_public->execute = execute;
   surf_cpu_model->extension_public->sleep = action_sleep;
   surf_cpu_model->extension_public->execute = execute;
   surf_cpu_model->extension_public->sleep = action_sleep;

+

   surf_cpu_model->extension_public->get_state = get_state;
   surf_cpu_model->extension_public->get_speed = get_speed;
   surf_cpu_model->extension_public->get_available_speed =
   surf_cpu_model->extension_public->get_state = get_state;
   surf_cpu_model->extension_public->get_speed = get_speed;
   surf_cpu_model->extension_public->get_available_speed =