getting rid of MSG_getClock

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

diff --git a/include/msg/msg.h b/include/msg/msg.h
index b583f46..5a83058 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -29,7 +29,6 @@ m_process_code_t MSG_get_registered_function(const char *name);
 void MSG_launch_application(const char *file);
 void MSG_paje_output(const char *filename);
 
 void MSG_launch_application(const char *file);
 void MSG_paje_output(const char *filename);
 

-double MSG_getClock(void);

 double MSG_get_clock(void);
 
 /************************** Host handling ***********************************/
 double MSG_get_clock(void);
 
 /************************** Host handling ***********************************/


@@ -74,7 +73,7 @@ m_process_t MSG_process_self(void);
 
 MSG_error_t MSG_process_suspend(m_process_t process);
 MSG_error_t MSG_process_resume(m_process_t process);
 
 MSG_error_t MSG_process_suspend(m_process_t process);
 MSG_error_t MSG_process_resume(m_process_t process);

-int MSG_process_isSuspended(m_process_t process);
+int MSG_process_is_suspended(m_process_t process);

 
 MSG_error_t MSG_process_start(m_process_t process);
 
 
 MSG_error_t MSG_process_start(m_process_t process);
 

diff --git a/src/gras/Virtu/sg_time.c b/src/gras/Virtu/sg_time.c
index ed80c7f..eee9cd5 100644 (file)
--- a/src/gras/Virtu/sg_time.c
+++ b/src/gras/Virtu/sg_time.c
@@ -13,7 +13,7 @@
  * Time elapsed since the begining of the simulation.
  */
 double gras_os_time() {
  * Time elapsed since the begining of the simulation.
  */
 double gras_os_time() {

-  return MSG_getClock();
+  return MSG_get_clock();

 }
 
 /*
 }
 
 /*

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 3910e49..d9f32ee 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -62,7 +62,7 @@ static void parse_process_finalize(void)
     process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
                                                NULL, parse_host,
                                                parse_argc,parse_argv);
     process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
                                                NULL, parse_host,
                                                parse_argc,parse_argv);

-    if(kill_time > MSG_getClock()) {
+    if(kill_time > MSG_get_clock()) {

       surf_timer_resource->extension_public->set(kill_time, 
                                                 (void*) &MSG_process_kill,
                                                 (void*) process);
       surf_timer_resource->extension_public->set(kill_time, 
                                                 (void*) &MSG_process_kill,
                                                 (void*) process);

diff --git a/src/msg/global.c b/src/msg/global.c
index 35816d7..b0c7eae 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -329,7 +329,7 @@ MSG_error_t MSG_main(void)
     if(xbt_fifo_size(msg_global->process_to_run) && (elapsed_time>0)) {
       DEBUG0("**************************************************");
     }
     if(xbt_fifo_size(msg_global->process_to_run) && (elapsed_time>0)) {
       DEBUG0("**************************************************");
     }

-    if((__stop_at_time>0) && (MSG_getClock() >= __stop_at_time)) {
+    if((__stop_at_time>0) && (MSG_get_clock() >= __stop_at_time)) {

       DEBUG0("Let's stop here!");
     }
 
       DEBUG0("Let's stop here!");
     }
 


@@ -358,7 +358,7 @@ MSG_error_t MSG_main(void)
       }
       
       if(!state_modifications) {
       }
       
       if(!state_modifications) {

-       DEBUG1("%g : Calling surf_solve",MSG_getClock());
+       DEBUG1("%g : Calling surf_solve",MSG_get_clock());

        elapsed_time = surf_solve();
        DEBUG1("Elapsed_time %g",elapsed_time);
        
        elapsed_time = surf_solve();
        DEBUG1("Elapsed_time %g",elapsed_time);
        


@@ -376,7 +376,7 @@ MSG_error_t MSG_main(void)
          process = MSG_process_create_with_arguments(args->name, args->code, 
                                                      args->data, args->host,
                                                      args->argc,args->argv);
          process = MSG_process_create_with_arguments(args->name, args->code, 
                                                      args->data, args->host,
                                                      args->argc,args->argv);

-         if(args->kill_time > MSG_getClock()) {
+         if(args->kill_time > MSG_get_clock()) {

            surf_timer_resource->extension_public->set(args->kill_time, 
                                                       (void*) &MSG_process_kill,
                                                       (void*) process);
            surf_timer_resource->extension_public->set(args->kill_time, 
                                                       (void*) &MSG_process_kill,
                                                       (void*) process);


@@ -553,14 +553,6 @@ MSG_error_t MSG_clean(void)
 }
 
 
 }
 
 

-/** \ingroup msg_easier_life
- * \brief A clock (in second).
- * \deprecated Use MSG_get_clock
- */
-double MSG_getClock(void) {
-  return surf_get_clock();
-}
-

 /** \ingroup msg_easier_life
  * \brief A clock (in second).
  */
 /** \ingroup msg_easier_life
  * \brief A clock (in second).
  */

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index cf14c13..acc012b 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -435,7 +435,7 @@ MSG_error_t MSG_process_resume(m_process_t process)
  * This checks whether a process is suspended or not by inspecting the
  * task on which it was waiting for the completion.
  */
  * This checks whether a process is suspended or not by inspecting the
  * task on which it was waiting for the completion.
  */

-int MSG_process_isSuspended(m_process_t process)
+int MSG_process_is_suspended(m_process_t process)

 {
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
 
 {
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");