X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ba65b25e98c8241e28fef5266584d47bdd4c0ed..cd69f8c66886ae218c6a9b38125b27fe157e6bb2:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index b416e59d74..55d9b3cde0 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2014. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -12,6 +13,8 @@ #include "simgrid/simix.h" +#include "simgrid/platf.h" + SG_BEGIN_DECL() /** @brief Return code of most MSG functions @@ -69,18 +72,49 @@ XBT_PUBLIC(void) MSG_set_function(const char *host_id, XBT_PUBLIC(double) MSG_get_clock(void); XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); +/************************** Environment ***********************************/ +XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(void); +XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as); +XBT_PUBLIC(msg_as_t) MSG_environment_as_get_by_name(const char * name); +XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_as_t as); +XBT_PUBLIC(const char *) MSG_environment_as_get_property_value(msg_as_t as, const char *name); +XBT_PUBLIC(const char *) MSG_environment_as_get_model(msg_as_t as); +XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as); /************************** File handling ***********************************/ -XBT_PUBLIC(double) MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t stream); -XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t stream); -XBT_PUBLIC(msg_file_t) MSG_file_open(const char* mount, const char* path, const char* mode); -XBT_PUBLIC(int) MSG_file_close(msg_file_t fp); -XBT_PUBLIC(int) MSG_file_stat(msg_file_t fd, s_msg_stat_t *buf); -XBT_PUBLIC(void) MSG_file_free_stat(s_msg_stat_t *stat); - -XBT_PUBLIC(int) MSG_file_unlink(msg_file_t fd); -XBT_PUBLIC(xbt_dict_t) MSG_file_ls(const char *mount, const char *path); - +XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size); +XBT_PUBLIC(sg_size_t) MSG_file_write(msg_file_t fd, sg_size_t size); +XBT_PUBLIC(msg_file_t) MSG_file_open(const char* fullpath, void* data); +XBT_PUBLIC(void*) MSG_file_get_data(msg_file_t fd); +XBT_PUBLIC(msg_error_t) MSG_file_set_data(msg_file_t fd, void * data); +XBT_PUBLIC(int) MSG_file_close(msg_file_t fd); +XBT_PUBLIC(sg_size_t) MSG_file_get_size(msg_file_t fd); +XBT_PUBLIC(void) MSG_file_dump(msg_file_t fd); +XBT_PUBLIC(msg_error_t) MSG_file_unlink(msg_file_t fd); +XBT_PUBLIC(msg_error_t) MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin); +XBT_PUBLIC(sg_size_t) MSG_file_tell (msg_file_t fd); +XBT_PUBLIC(void) __MSG_file_get_info(msg_file_t fd); +XBT_PUBLIC(void) __MSG_file_priv_free(msg_file_priv_t priv); +XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t storage); +XBT_PUBLIC(msg_error_t) MSG_file_move(msg_file_t fd, const char* fullpath); +XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath); +XBT_PUBLIC(msg_error_t) MSG_file_rmove(msg_file_t fd, msg_host_t host, const char* fullpath); +/************************** Storage handling ***********************************/ +XBT_PUBLIC(msg_host_t) MSG_get_storage_by_name(const char *name); +XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage); +XBT_PUBLIC(sg_size_t) MSG_storage_get_free_size(msg_storage_t storage); +XBT_PUBLIC(sg_size_t) MSG_storage_get_used_size(msg_storage_t storage); +XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name); +XBT_PUBLIC(xbt_dict_t) MSG_storage_get_properties(msg_storage_t storage); +XBT_PUBLIC(void) MSG_storage_set_property_value(msg_storage_t storage, const char *name, char *value,void_f_pvoid_t free_ctn); +XBT_PUBLIC(const char *)MSG_storage_get_property_value(msg_storage_t storage, const char *name); +XBT_PUBLIC(xbt_dynar_t) MSG_storages_as_dynar(void); +XBT_PUBLIC(msg_error_t) MSG_storage_set_data(msg_storage_t host, void *data); +XBT_PUBLIC(void *) MSG_storage_get_data(msg_storage_t storage); +XBT_PUBLIC(xbt_dict_t) MSG_storage_get_content(msg_storage_t storage); +XBT_PUBLIC(sg_size_t) MSG_storage_get_size(msg_storage_t storage); +XBT_PUBLIC(msg_error_t) MSG_storage_file_move(msg_file_t fd, msg_host_t dest, char* mount, char* fullname); +XBT_PUBLIC(const char *) MSG_storage_get_host(msg_storage_t storage); /************************** AS Router handling ************************************/ XBT_PUBLIC(const char *) MSG_as_router_get_property_value(const char* asr, const char *name); XBT_PUBLIC(xbt_dict_t) MSG_as_router_get_properties(const char* asr); @@ -90,14 +124,24 @@ XBT_PUBLIC(void) MSG_as_router_set_property_value(const char* asr, const char *n XBT_PUBLIC(msg_error_t) MSG_host_set_data(msg_host_t host, void *data); XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host); XBT_PUBLIC(const char *) MSG_host_get_name(msg_host_t host); +XBT_PUBLIC(void) MSG_host_on(msg_host_t host); +XBT_PUBLIC(void) MSG_host_off(msg_host_t host); XBT_PUBLIC(msg_host_t) MSG_host_self(void); XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host); -/* int MSG_get_msgload(void); This function lacks specification; discard it */ XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); -XBT_PUBLIC(int) MSG_host_is_avail(msg_host_t h); +XBT_PUBLIC(int) MSG_host_get_core_number(msg_host_t h); +XBT_PUBLIC(xbt_swag_t) MSG_host_get_process_list(msg_host_t h); +XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); +XBT_PUBLIC(int) MSG_host_is_off(msg_host_t h); XBT_PUBLIC(void) __MSG_host_priv_free(msg_host_priv_t priv); XBT_PUBLIC(void) __MSG_host_destroy(msg_host_t host); +XBT_PUBLIC(double) MSG_get_host_power_peak_at(msg_host_t h, int pstate_index); +XBT_PUBLIC(double) MSG_get_host_current_power_peak(msg_host_t h); +XBT_PUBLIC(int) MSG_get_host_nb_pstates(msg_host_t h); +XBT_PUBLIC(void) MSG_set_host_power_peak_at(msg_host_t h, int pstate); +XBT_PUBLIC(double) MSG_get_host_consumed_energy(msg_host_t h); + /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); XBT_PUBLIC(const char *) MSG_host_get_property_value(msg_host_t host, @@ -112,10 +156,11 @@ XBT_PUBLIC(void) MSG_create_environment(const char *file); XBT_PUBLIC(msg_host_t) MSG_get_host_by_name(const char *name); XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); XBT_PUBLIC(int) MSG_get_host_number(void); - XBT_PUBLIC(void) MSG_host_get_params(msg_host_t ind_pm, ws_params_t params); XBT_PUBLIC(void) MSG_host_set_params(msg_host_t ind_pm, ws_params_t params); - +XBT_PUBLIC(xbt_dict_t) MSG_host_get_mounted_storage_list(msg_host_t host); +XBT_PUBLIC(xbt_dynar_t) MSG_host_get_attached_storage_list(msg_host_t host); +XBT_PUBLIC(xbt_dict_t) MSG_host_get_storage_content(msg_host_t host); /************************** Process handling *********************************/ XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, xbt_main_func_t code, @@ -138,7 +183,6 @@ XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char properties); XBT_PUBLIC(void) MSG_process_kill(msg_process_t process); XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs); - XBT_PUBLIC(msg_error_t) MSG_process_migrate(msg_process_t process, msg_host_t host); XBT_PUBLIC(void *) MSG_process_get_data(msg_process_t process); @@ -167,7 +211,7 @@ XBT_PUBLIC(const char *) MSG_process_get_property_value(msg_process_t XBT_PUBLIC(msg_error_t) MSG_process_suspend(msg_process_t process); XBT_PUBLIC(msg_error_t) MSG_process_resume(msg_process_t process); XBT_PUBLIC(int) MSG_process_is_suspended(msg_process_t process); -XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_t fun, void *data); +XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data); XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart); XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); @@ -205,7 +249,10 @@ XBT_PUBLIC(msg_error_t) MSG_task_receive_from_host_bounded(msg_task_t * task, co XBT_PUBLIC(msg_error_t) MSG_task_execute(msg_task_t task); XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute(msg_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(msg_task_t task, double priority); +XBT_PUBLIC(void) MSG_task_set_bound(msg_task_t task, double bound); +XBT_PUBLIC(void) MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask); +XBT_PUBLIC(msg_error_t) MSG_process_join(msg_process_t process, double timeout); XBT_PUBLIC(msg_error_t) MSG_process_sleep(double nb_sec); XBT_PUBLIC(double) MSG_task_get_compute_duration(msg_task_t task); @@ -304,11 +351,13 @@ XBT_PUBLIC(msg_error_t) MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task, double timeout); -void MSG_mailbox_set_async(const char *alias); +XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); /************************** Action handling **********************************/ XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); +XBT_PUBLIC(void) MSG_action_init(void); +XBT_PUBLIC(void) MSG_action_exit(void); #ifdef MSG_USE_DEPRECATED @@ -320,6 +369,8 @@ typedef msg_error_t MSG_error_t; /* these are the functions which are deprecated. Do not use them, they may get removed in future releases */ XBT_PUBLIC(msg_host_t *) MSG_get_host_table(void); +#define MSG_host_is_avail(h) MSG_host_is_on(h) + #define MSG_TIMEOUT_FAILURE MSG_TIMEOUT #define MSG_TASK_CANCELLED MSG_TASK_CANCELED #define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \ @@ -357,6 +408,30 @@ XBT_PUBLIC(msg_error_t) MSG_set_channel_number(int number); XBT_PUBLIC(int) MSG_get_channel_number(void); #endif +/** @brief Opaque type representing a semaphore + * @ingroup msg_synchro + * @hideinitializer + */ +typedef struct s_smx_sem *msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be declared here +XBT_PUBLIC(msg_sem_t) MSG_sem_init(int initial_value); +XBT_PUBLIC(void) MSG_sem_acquire(msg_sem_t sem); +XBT_PUBLIC(msg_error_t) MSG_sem_acquire_timeout(msg_sem_t sem, double timeout); +XBT_PUBLIC(void) MSG_sem_release(msg_sem_t sem); +XBT_PUBLIC(void) MSG_sem_get_capacity(msg_sem_t sem); +XBT_PUBLIC(void) MSG_sem_destroy(msg_sem_t sem); +XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem); + +/** @brief Opaque type representing a barrier identifier + * @ingroup msg_synchro + * @hideinitializer + */ + +#define MSG_BARRIER_SERIAL_PROCESS -1 +typedef struct s_xbt_bar *msg_bar_t; +XBT_PUBLIC(msg_bar_t) MSG_barrier_init( unsigned int count); +XBT_PUBLIC(void) MSG_barrier_destroy(msg_bar_t bar); +XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); + /** @brief Opaque type describing a Virtual Machine. * @ingroup msg_VMs * @@ -365,19 +440,30 @@ XBT_PUBLIC(int) MSG_get_channel_number(void); * Usual lack of guaranty of any kind applies here, and is even increased. * */ -/* This function should not be called directly, but rather from MSG_vm_start_from_template that does not exist yet*/ + +XBT_PUBLIC(int) MSG_vm_is_created(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t); + +XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_saving(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_saved(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_restoring(msg_vm_t); + + +XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); // TODO add VDI later XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name); XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name, - int core_nb, int mem_cap, int net_cap, char *disk_path, int disk_size); + int core_nb, int mem_cap, int net_cap, char *disk_path, int disk_size, int mig_netspeed, int dp_intensity); -XBT_PUBLIC(void) MSG_vm_start(msg_vm_t); +XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); -XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t); +XBT_PUBLIC(void) MSG_vm_start(msg_vm_t); -XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); +/* Shutdown the guest operating system. */ +XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_migrate(msg_vm_t vm, msg_host_t destination); @@ -389,10 +475,9 @@ XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_save(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_restore(msg_vm_t vm); -/* Shutdown the guest operating system. */ -XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); - -XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); +XBT_PUBLIC(msg_host_t) MSG_vm_get_pm(msg_vm_t vm); +XBT_PUBLIC(void) MSG_vm_set_bound(msg_vm_t vm, double bound); +XBT_PUBLIC(void) MSG_vm_set_affinity(msg_vm_t vm, msg_host_t pm, unsigned long mask); /* TODO: do we need this? */ // XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar(void); @@ -424,11 +509,5 @@ xbt_dynar_t MSG_vm_get_list_from_hosts(msg_dynar_t) /* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */ XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(msg_process_t process); -/* ****************************************************************************************** */ -/* TUTORIAL: New API */ -/* Declare all functions for the API */ -/* ****************************************************************************************** */ -XBT_PUBLIC(int) MSG_new_API_fct(const char* param1, double param2); - SG_END_DECL() #endif