From: alegrand Date: Fri, 11 Feb 2005 05:55:43 +0000 (+0000) Subject: SURF does not use long doubles. Reverting MSG to doubles. X-Git-Tag: v3.3~4388 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4a5549091dbdecc6e56ff56e09ef922ba83b1d02?ds=sidebyside SURF does not use long doubles. Reverting MSG to doubles. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@963 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/msg/msg.h b/include/msg/msg.h index 57edac096e..63837ec477 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -15,7 +15,7 @@ void MSG_global_init(void); void MSG_global_init_args(int *argc, char **argv); void MSG_set_verbosity(MSG_outputmode_t mode); MSG_error_t MSG_set_channel_number(int number); -MSG_error_t MSG_set_sharing_policy(MSG_sharing_t mode, long double param); +MSG_error_t MSG_set_sharing_policy(MSG_sharing_t mode, double param); int MSG_get_channel_number(void); MSG_error_t MSG_main(void); MSG_error_t MSG_clean(void); @@ -24,7 +24,7 @@ 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); -long double MSG_getClock(void); +double MSG_getClock(void); /************************** Host handling ***********************************/ MSG_error_t MSG_host_set_data(m_host_t host, void *data); @@ -73,8 +73,8 @@ MSG_error_t MSG_process_start(m_process_t process); /************************** Task handling ************************************/ -m_task_t MSG_task_create(const char *name, long double compute_duration, - long double message_size, void *data); +m_task_t MSG_task_create(const char *name, double compute_duration, + double message_size, void *data); void *MSG_task_get_data(m_task_t task); m_process_t MSG_task_get_sender(m_task_t task); MSG_error_t MSG_task_destroy(m_task_t task); @@ -84,11 +84,11 @@ MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel); MSG_error_t MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, - long double max_rate); + double max_rate); MSG_error_t MSG_task_execute(m_task_t task); int MSG_task_Iprobe(m_channel_t channel); int MSG_task_probe_from(m_channel_t channel); -MSG_error_t MSG_process_sleep(long double nb_sec); +MSG_error_t MSG_process_sleep(double nb_sec); MSG_error_t MSG_get_errno(void); /************************** Deprecated ***************************************/ diff --git a/src/msg/global.c b/src/msg/global.c index 5db4445c1b..885ca40841 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -14,7 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(global, msg, MSG_Global_t msg_global = NULL; /* static void MarkAsFailed(m_task_t t, TBX_HashTable_t failedProcessList); */ -/* static xbt_fifo_t MSG_buildFailedHostList(long double a, long double b); */ +/* static xbt_fifo_t MSG_buildFailedHostList(double a, double b); */ /** \defgroup msg_simulation MSG simulation Functions * \brief This section describes the functions you need to know to @@ -274,7 +274,7 @@ MSG_error_t MSG_set_channel_number(int number) currently used only for the MSG_STORE_AND_FORWARD flavor and represents the granularity of the communications (i.e. the packet size). */ -MSG_error_t MSG_set_sharing_policy(MSG_sharing_t mode, long double param) +MSG_error_t MSG_set_sharing_policy(MSG_sharing_t mode, double param) { CRITICAL0("MSG_set_sharing_policy: this function is now deprecated and useless. Store and forward does not exist anymore. Please stop using it."); @@ -321,11 +321,11 @@ MSG_error_t MSG_main(void) xbt_context_schedule(process->simdata->context); msg_global->current_process = NULL; } - DEBUG1("%Lg : Calling surf_solve",MSG_getClock()); + DEBUG1("%lg : Calling surf_solve",MSG_getClock()); elapsed_time = surf_solve(); DEBUG1("Elapsed_time %lg",elapsed_time); -/* fprintf(stderr, "====== %Lg =====\n",Now); */ +/* fprintf(stderr, "====== %lg =====\n",Now); */ /* if (elapsed_time==0.0) { */ /* fprintf(stderr, "No change in time\n"); */ /* } */ @@ -465,7 +465,7 @@ MSG_error_t MSG_main(void) /* } */ -/* static xbt_fifo_t MSG_buildFailedHostList(long double begin, long double end) */ +/* static xbt_fifo_t MSG_buildFailedHostList(double begin, double end) */ /* { */ /* xbt_fifo_t failedHostList = xbt_fifo_new(); */ /* m_host_t host = NULL; */ @@ -542,7 +542,7 @@ MSG_error_t MSG_clean(void) /** \ingroup msg_easier_life * \brief A clock (in second). */ -long double MSG_getClock(void) { +double MSG_getClock(void) { return surf_get_clock(); } diff --git a/src/msg/gos.c b/src/msg/gos.c index ba982f87d8..3831fa454f 100644 --- a/src/msg/gos.c +++ b/src/msg/gos.c @@ -245,7 +245,7 @@ MSG_error_t MSG_task_put(m_task_t task, */ MSG_error_t MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, - long double max_rate) + double max_rate) { task->simdata->rate=max_rate; return(MSG_task_put(task, dest, channel)); @@ -316,7 +316,7 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task) * * \param nb_sec a number of second */ -MSG_error_t MSG_process_sleep(long double nb_sec) +MSG_error_t MSG_process_sleep(double nb_sec) { e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; m_process_t process = MSG_process_self(); diff --git a/src/msg/task.c b/src/msg/task.c index 80a7c72692..2cec867ab3 100644 --- a/src/msg/task.c +++ b/src/msg/task.c @@ -45,8 +45,8 @@ static char sprint_buffer[64]; * \see m_task_t * \return The new corresponding object. */ -m_task_t MSG_task_create(const char *name, long double compute_duration, - long double message_size, void *data) +m_task_t MSG_task_create(const char *name, double compute_duration, + double message_size, void *data) { simdata_task_t simdata = xbt_new0(s_simdata_task_t,1); m_task_t task = xbt_new0(s_m_task_t,1);