From: Takahiro Hirofuchi Date: Wed, 5 Jun 2013 21:52:55 +0000 (+0200) Subject: fix compilation warnings X-Git-Tag: v3_11_beta~297^2^2~33 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5cc7b86de46ab1595542f8e00219d45837fe82c0 fix compilation warnings --- diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 884ab057bd..109ebbc1b3 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -102,7 +102,6 @@ XBT_PUBLIC_DATA(xbt_dict_t) MSG_vm_get_properties(msg_vm_t vm); XBT_PUBLIC_DATA(void) MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_f_pvoid_t free_ctn); XBT_PUBLIC_DATA(msg_vm_t) MSG_vm_get_by_name(const char *name); XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm); -XBT_PUBLIC_DATA(double) get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock); /************************** Global variables ********************************/ typedef struct MSG_Global { diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index 113b52167f..717cb22e2f 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -425,7 +425,7 @@ double calc_updated_pages(char *key, msg_vm_t vm, dirty_page_t dp, double remain } #endif -double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) +static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) { double computed = dp->prev_remaining - remaining; double duration = clock - dp->prev_clock; @@ -557,7 +557,7 @@ static void launch_deferred_exec_process(msg_host_t host, double computation, do argv[2] = bprintf("%lf", prio); argv[3] = NULL; - msg_process_t pr = MSG_process_create_with_arguments(pr_name, deferred_exec_fun, NULL, host, nargvs - 1, argv); + MSG_process_create_with_arguments(pr_name, deferred_exec_fun, NULL, host, nargvs - 1, argv); xbt_free(pr_name); } @@ -607,7 +607,7 @@ static void start_overhead_process(msg_task_t comm_task) argv[2] = NULL; // XBT_INFO("micro start: mbox %s", mbox); - msg_process_t pr = MSG_process_create_with_arguments(pr_name, task_tx_overhead_fun, NULL, MSG_host_self(), nargvs - 1, argv); + MSG_process_create_with_arguments(pr_name, task_tx_overhead_fun, NULL, MSG_host_self(), nargvs - 1, argv); xbt_free(pr_name); xbt_free(mbox); @@ -833,7 +833,7 @@ static void send_migration_data(const char *vm_name, const char *src_pm_name, co #endif } -double get_updated_size(double computed, double dp_rate, double dp_cap) +static double get_updated_size(double computed, double dp_rate, double dp_cap) { double updated_size = computed * dp_rate; XBT_INFO("updated_size %f dp_rate %f", updated_size, dp_rate); diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 11255b8d82..c7b487d9f4 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -74,6 +74,7 @@ void SIMIX_pre_host_execution_cancel(smx_simcall_t, smx_action_t); double SIMIX_pre_host_execution_get_remains(smx_simcall_t, smx_action_t); e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t, smx_action_t); void SIMIX_pre_host_execution_set_priority(smx_simcall_t, smx_action_t, double); +void SIMIX_pre_host_execution_set_bound(smx_simcall_t simcall, smx_action_t action, double bound); void SIMIX_host_execution_suspend(smx_action_t action); void SIMIX_host_execution_resume(smx_action_t action);