From: Martin Quinson Date: Fri, 27 Apr 2012 20:09:38 +0000 (+0200) Subject: Merge all public simix headers, and distribute them in simgrid directory X-Git-Tag: v3_7~40 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd88e15504912f111b8dcb568c2a8adbc111ed66 Merge all public simix headers, and distribute them in simgrid directory Actually, I think I never understood why we have a separate datatypes.h header: what's the harm of declaring the functions too? I kinda prefer one directory with all files instead of 12 directories with 2 files each. --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 45da8465ab..bf28e63461 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -437,6 +437,7 @@ set(headers_to_install include/xbt/file_stat.h include/simgrid/platf.h include/simgrid/modelchecker.h + include/simgrid/simix.h include/msg/msg.h include/msg/datatypes.h include/simdag/simdag.h @@ -460,9 +461,6 @@ set(headers_to_install include/instr/instr.h include/gras.h include/xbt.h - include/simix/simix.h - include/simix/datatypes.h - include/simix/context.h ) set(source_of_generated_headers include/simgrid_config.h.in diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index d2c306c0f9..e45e988dde 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -7,7 +7,7 @@ #include #include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "simix/simix.h" /* semaphores for the barrier */ +#include "simgrid/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ #include "instr/instr_private.h" diff --git a/include/msg/msg.h b/include/msg/msg.h index a0d1f78c43..625cc6ff00 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -12,7 +12,7 @@ #include "msg/datatypes.h" #include "xbt/automaton.h" -#include "simix/simix.h" +#include "simgrid/simix.h" SG_BEGIN_DECL() @@ -287,7 +287,6 @@ XBT_PUBLIC(int) MSG_get_channel_number(void); #include "instr/instr.h" /* Used only by the bindings */ -#include "simix/simix.h" XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process); SG_END_DECL() diff --git a/include/simix/simix.h b/include/simgrid/simix.h similarity index 65% rename from include/simix/simix.h rename to include/simgrid/simix.h index f34bcc3002..4464505981 100644 --- a/include/simix/simix.h +++ b/include/simgrid/simix.h @@ -12,11 +12,190 @@ #include "xbt/dict.h" #include "xbt/file_stat.h" #include "xbt/function_types.h" -#include "simix/datatypes.h" -#include "simix/context.h" +#include "xbt/parmap.h" +#include "xbt/swag.h" SG_BEGIN_DECL() + +/* ******************************** Host ************************************ */ +/** @defgroup m_datatypes_management_details Details on SIMIX datatypes */ +/** @brief Host datatype + @ingroup m_datatypes_management + + A location (or host) is any possible place where + a process may run. Thus it is represented as a physical + resource with computing capabilities, some mailboxes + to enable running process to communicate with remote ones, and + some private data that can be only accessed by local + process. + + \see m_host_management + @{ */ +typedef struct s_smx_host *smx_host_t; +typedef enum { + SIMIX_WAITING, + SIMIX_READY, + SIMIX_RUNNING, + SIMIX_DONE, + SIMIX_CANCELED, + SIMIX_FAILED, + SIMIX_SRC_HOST_FAILURE, + SIMIX_DST_HOST_FAILURE, + SIMIX_SRC_TIMEOUT, + SIMIX_DST_TIMEOUT, + SIMIX_LINK_FAILURE +} e_smx_state_t; +/** @} */ + + +typedef struct s_smx_timer* smx_timer_t; + +/* ******************************** Synchro ************************************ */ +typedef struct s_smx_mutex *smx_mutex_t; +typedef struct s_smx_cond *smx_cond_t; +typedef struct s_smx_sem *smx_sem_t; + +/********************************** File *************************************/ +typedef struct s_smx_file *smx_file_t; +typedef struct s_smx_stat *smx_stat_t; + +/********************************** Action *************************************/ +typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized action handlers */ + + + +/* ****************************** Process *********************************** */ +/** @brief Process datatype + @ingroup m_datatypes_management + + A processt may be defined as a code, with some private + data, executing in a location. + \see m_process_management + @{ */ +typedef struct s_smx_process *smx_process_t; +/** @} */ + + +/* + * Type of function that creates a process. + * The function must accept the following parameters: + * void* process: the process created will be stored there + * const char *name: a name for the object. It is for user-level information and can be NULL + * xbt_main_func_t code: is a function describing the behavior of the process + * void *data: data a pointer to any data one may want to attach to the new object. + * smx_host_t host: the location where the new process is executed + * int argc, char **argv: parameters passed to code + * xbt_dict_t pros: properties + */ +typedef void (*smx_creation_func_t) ( /* process */ smx_process_t*, + /* name */ const char*, + /* code */ xbt_main_func_t, + /* userdata */ void*, + /* hostname */ const char*, + /* argc */ int, + /* argv */ char**, + /* props */ xbt_dict_t); + + +/******************************* Networking ***********************************/ +typedef struct s_smx_rvpoint *smx_rdv_t; + +/******************************** Context *************************************/ +typedef struct s_smx_context *smx_context_t; +typedef struct s_smx_context_factory *smx_context_factory_t; + +/* Process creation/destruction callbacks */ +typedef void (*void_pfn_smxprocess_t) (smx_process_t); + + +/* The following function pointer types describe the interface that any context + factory should implement */ + + +typedef smx_context_t(*smx_pfn_context_factory_create_context_t) + (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, void* data); +typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t*); +typedef void (*smx_pfn_context_free_t) (smx_context_t); +typedef void (*smx_pfn_context_start_t) (smx_context_t); +typedef void (*smx_pfn_context_stop_t) (smx_context_t); +typedef void (*smx_pfn_context_suspend_t) (smx_context_t context); +typedef void (*smx_pfn_context_runall_t) (void); +typedef smx_context_t (*smx_pfn_context_self_t) (void); +typedef void* (*smx_pfn_context_get_data_t) (smx_context_t context); + +/* interface of the context factories */ +typedef struct s_smx_context_factory { + const char *name; + smx_pfn_context_factory_create_context_t create_context; + smx_pfn_context_factory_finalize_t finalize; + smx_pfn_context_free_t free; + smx_pfn_context_stop_t stop; + smx_pfn_context_suspend_t suspend; + smx_pfn_context_runall_t runall; + smx_pfn_context_self_t self; + smx_pfn_context_get_data_t get_data; +} s_smx_context_factory_t; + +/* Hack: let msg load directly the right factory */ +typedef void (*smx_ctx_factory_initializer_t)(smx_context_factory_t*); +XBT_PUBLIC(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use; +extern char* smx_context_factory_name; +extern int smx_context_stack_size; + +#ifdef HAVE_THREAD_LOCAL_STORAGE +extern __thread smx_context_t smx_current_context; +#else +extern smx_context_t smx_current_context; +#endif + +/* *********************** */ +/* Context type definition */ +/* *********************** */ +/* the following function pointers types describe the interface that all context + concepts must implement */ +/* each context type derive from this structure, so they must contain this structure + * at their beginning -- OOP in C :/ */ +typedef struct s_smx_context { + s_xbt_swag_hookup_t hookup; + xbt_main_func_t code; + void_pfn_smxprocess_t cleanup_func; + void *data; /* Here SIMIX stores the smx_process_t containing the context */ + char **argv; + int argc; + int iwannadie:1; +} s_smx_ctx_base_t; + +/* methods of this class */ +XBT_PUBLIC(void) smx_ctx_base_factory_init(smx_context_factory_t *factory); +XBT_PUBLIC(int) smx_ctx_base_factory_finalize(smx_context_factory_t *factory); + +XBT_PUBLIC(smx_context_t) +smx_ctx_base_factory_create_context_sized(size_t size, + xbt_main_func_t code, int argc, + char **argv, + void_pfn_smxprocess_t cleanup, + void* data); +XBT_PUBLIC(void) smx_ctx_base_free(smx_context_t context); +XBT_PUBLIC(void) smx_ctx_base_stop(smx_context_t context); +XBT_PUBLIC(smx_context_t) smx_ctx_base_self(void); +XBT_PUBLIC(void) *smx_ctx_base_get_data(smx_context_t context); + +XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void); +XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); +XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void); + +/* parallelism */ +XBT_PUBLIC(int) SIMIX_context_is_parallel(void); +XBT_PUBLIC(int) SIMIX_context_get_nthreads(void); +XBT_PUBLIC(void) SIMIX_context_set_nthreads(int nb_threads); +XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(void); +XBT_PUBLIC(void) SIMIX_context_set_parallel_threshold(int threshold); +XBT_PUBLIC(e_xbt_parmap_mode_t) SIMIX_context_get_parallel_mode(void); +XBT_PUBLIC(void) SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); + + + /********************************** Global ************************************/ /* Initialization and exit */ XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv); diff --git a/include/simix/context.h b/include/simix/context.h deleted file mode 100644 index 9408c19125..0000000000 --- a/include/simix/context.h +++ /dev/null @@ -1,113 +0,0 @@ -/* a fast and simple context switching library */ - -/* Copyright (c) 2009, 2010. 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. */ - -#ifndef _SIMIX_CONTEXT_H -#define _SIMIX_CONTEXT_H - -#include "xbt/swag.h" -#include "xbt/parmap.h" -#include "simix/datatypes.h" -#include "simgrid_config.h" - -SG_BEGIN_DECL() -/******************************** Context *************************************/ -typedef struct s_smx_context *smx_context_t; -typedef struct s_smx_context_factory *smx_context_factory_t; - -/* Process creation/destruction callbacks */ -typedef void (*void_pfn_smxprocess_t) (smx_process_t); - - -/* The following function pointer types describe the interface that any context - factory should implement */ - - -typedef smx_context_t(*smx_pfn_context_factory_create_context_t) - (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, void* data); -typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t*); -typedef void (*smx_pfn_context_free_t) (smx_context_t); -typedef void (*smx_pfn_context_start_t) (smx_context_t); -typedef void (*smx_pfn_context_stop_t) (smx_context_t); -typedef void (*smx_pfn_context_suspend_t) (smx_context_t context); -typedef void (*smx_pfn_context_runall_t) (void); -typedef smx_context_t (*smx_pfn_context_self_t) (void); -typedef void* (*smx_pfn_context_get_data_t) (smx_context_t context); - -/* interface of the context factories */ -typedef struct s_smx_context_factory { - const char *name; - smx_pfn_context_factory_create_context_t create_context; - smx_pfn_context_factory_finalize_t finalize; - smx_pfn_context_free_t free; - smx_pfn_context_stop_t stop; - smx_pfn_context_suspend_t suspend; - smx_pfn_context_runall_t runall; - smx_pfn_context_self_t self; - smx_pfn_context_get_data_t get_data; -} s_smx_context_factory_t; - -/* Hack: let msg load directly the right factory */ -typedef void (*smx_ctx_factory_initializer_t)(smx_context_factory_t*); -XBT_PUBLIC(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use; -extern char* smx_context_factory_name; -extern int smx_context_stack_size; - -#ifdef HAVE_THREAD_LOCAL_STORAGE -extern __thread smx_context_t smx_current_context; -#else -extern smx_context_t smx_current_context; -#endif - -/* *********************** */ -/* Context type definition */ -/* *********************** */ -/* the following function pointers types describe the interface that all context - concepts must implement */ -/* each context type derive from this structure, so they must contain this structure - * at their beginning -- OOP in C :/ */ -typedef struct s_smx_context { - s_xbt_swag_hookup_t hookup; - xbt_main_func_t code; - void_pfn_smxprocess_t cleanup_func; - void *data; /* Here SIMIX stores the smx_process_t containing the context */ - char **argv; - int argc; - int iwannadie:1; -} s_smx_ctx_base_t; - -/* methods of this class */ -XBT_PUBLIC(void) smx_ctx_base_factory_init(smx_context_factory_t *factory); -XBT_PUBLIC(int) smx_ctx_base_factory_finalize(smx_context_factory_t *factory); - -XBT_PUBLIC(smx_context_t) -smx_ctx_base_factory_create_context_sized(size_t size, - xbt_main_func_t code, int argc, - char **argv, - void_pfn_smxprocess_t cleanup, - void* data); -XBT_PUBLIC(void) smx_ctx_base_free(smx_context_t context); -XBT_PUBLIC(void) smx_ctx_base_stop(smx_context_t context); -XBT_PUBLIC(smx_context_t) smx_ctx_base_self(void); -XBT_PUBLIC(void) *smx_ctx_base_get_data(smx_context_t context); - -XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void); -XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); -XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void); - -/* parallelism */ -XBT_PUBLIC(int) SIMIX_context_is_parallel(void); -XBT_PUBLIC(int) SIMIX_context_get_nthreads(void); -XBT_PUBLIC(void) SIMIX_context_set_nthreads(int nb_threads); -XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(void); -XBT_PUBLIC(void) SIMIX_context_set_parallel_threshold(int threshold); -XBT_PUBLIC(e_xbt_parmap_mode_t) SIMIX_context_get_parallel_mode(void); -XBT_PUBLIC(void) SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); - -SG_END_DECL() - -#endif /* !_XBT_CONTEXT_H */ diff --git a/include/simix/datatypes.h b/include/simix/datatypes.h deleted file mode 100644 index b41e98944e..0000000000 --- a/include/simix/datatypes.h +++ /dev/null @@ -1,101 +0,0 @@ -/* Copyright (c) 2007, 2009, 2010. 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. */ - -#ifndef _SIMIX_DATATYPES_H -#define _SIMIX_DATATYPES_H -#include "xbt/misc.h" -#include "xbt/swag.h" -#include "xbt/fifo.h" -#include "xbt/dict.h" - -SG_BEGIN_DECL() - -/* ******************************** Host ************************************ */ -/** @defgroup m_datatypes_management_details Details on SIMIX datatypes */ -/** @brief Host datatype - @ingroup m_datatypes_management - - A location (or host) is any possible place where - a process may run. Thus it is represented as a physical - resource with computing capabilities, some mailboxes - to enable running process to communicate with remote ones, and - some private data that can be only accessed by local - process. - - \see m_host_management - @{ */ -typedef struct s_smx_host *smx_host_t; -typedef enum { - SIMIX_WAITING, - SIMIX_READY, - SIMIX_RUNNING, - SIMIX_DONE, - SIMIX_CANCELED, - SIMIX_FAILED, - SIMIX_SRC_HOST_FAILURE, - SIMIX_DST_HOST_FAILURE, - SIMIX_SRC_TIMEOUT, - SIMIX_DST_TIMEOUT, - SIMIX_LINK_FAILURE -} e_smx_state_t; -/** @} */ - - -typedef struct s_smx_timer* smx_timer_t; - -/* ******************************** Synchro ************************************ */ -typedef struct s_smx_mutex *smx_mutex_t; -typedef struct s_smx_cond *smx_cond_t; -typedef struct s_smx_sem *smx_sem_t; - -/********************************** File *************************************/ -typedef struct s_smx_file *smx_file_t; -typedef struct s_smx_stat *smx_stat_t; - -/********************************** Action *************************************/ -typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized action handlers */ - - - -/* ****************************** Process *********************************** */ -/** @brief Process datatype - @ingroup m_datatypes_management - - A processt may be defined as a code, with some private - data, executing in a location. - \see m_process_management - @{ */ -typedef struct s_smx_process *smx_process_t; -/** @} */ - - -/* - * Type of function that creates a process. - * The function must accept the following parameters: - * void* process: the process created will be stored there - * const char *name: a name for the object. It is for user-level information and can be NULL - * xbt_main_func_t code: is a function describing the behavior of the process - * void *data: data a pointer to any data one may want to attach to the new object. - * smx_host_t host: the location where the new process is executed - * int argc, char **argv: parameters passed to code - * xbt_dict_t pros: properties - */ -typedef void (*smx_creation_func_t) ( /* process */ smx_process_t*, - /* name */ const char*, - /* code */ xbt_main_func_t, - /* userdata */ void*, - /* hostname */ const char*, - /* argc */ int, - /* argv */ char**, - /* props */ xbt_dict_t); - - -/******************************* Networking ***********************************/ -typedef struct s_smx_rvpoint *smx_rdv_t; - - -SG_END_DECL() -#endif diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c index 0471d13b68..3816885af6 100644 --- a/src/gras/Msg/sg_msg.c +++ b/src/gras/Msg/sg_msg.c @@ -18,7 +18,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_msg); typedef void *gras_trp_bufdata_; -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "simix/smx_private.h" /* Yeah, the following is awfull, breaking the encapsulation of at least 3 modules diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h index abbda60904..c0bb894dbe 100644 --- a/src/gras/Transport/transport_interface.h +++ b/src/gras/Transport/transport_interface.h @@ -12,7 +12,7 @@ #define GRAS_TRP_INTERFACE_H #include "portable.h" /* sometimes needed for fd_set */ -#include "simix/simix.h" +#include "simgrid/simix.h" #include "xbt/queue.h" /* Data of this module specific to each process diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index ebdc3d9255..6dbffd0228 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -12,7 +12,7 @@ #include "xbt/ex.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "gras/Msg/msg_private.h" #include "gras/Transport/transport_private.h" #include "gras/Virtu/virtu_sg.h" diff --git a/src/gras/Virtu/virtu_private.h b/src/gras/Virtu/virtu_private.h index 315214c046..529ce8384c 100644 --- a/src/gras/Virtu/virtu_private.h +++ b/src/gras/Virtu/virtu_private.h @@ -14,7 +14,7 @@ #include "xbt/dynar.h" #include "gras/Virtu/virtu_interface.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "gras/Msg/msg_private.h" /** @brief Data for each process */ diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h index 93e1cce9ce..f4e7bab1fd 100644 --- a/src/gras/Virtu/virtu_sg.h +++ b/src/gras/Virtu/virtu_sg.h @@ -11,7 +11,7 @@ #include "gras/Virtu/virtu_private.h" #include "xbt/dynar.h" -#include "simix/simix.h" /* SimGrid header */ +#include "simgrid/simix.h" /* SimGrid header */ #include "gras/Transport/transport_private.h" typedef struct { diff --git a/src/gras/rl_stubs.c b/src/gras/rl_stubs.c index 2a75a5f243..a9d5ddf790 100644 --- a/src/gras/rl_stubs.c +++ b/src/gras/rl_stubs.c @@ -8,7 +8,7 @@ #include "xbt_modinter.h" #include "xbt/sysdep.h" -#include "simix/simix.h" +#include "simgrid/simix.h" void SIMIX_display_process_status(void) { diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h index 1bd8148ff6..1fe6b57339 100644 --- a/src/include/mc/mc.h +++ b/src/include/mc/mc.h @@ -11,7 +11,7 @@ #include "xbt/dict.h" #include "xbt/function_types.h" #include "mc/datatypes.h" -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "simgrid/modelchecker.h" /* our public interface (and definition of HAVE_MC) */ #include "xbt/automaton.h" diff --git a/src/include/simix/context.h b/src/include/simix/context.h index 072ab5dfc2..eaa0bfcf0a 100644 --- a/src/include/simix/context.h +++ b/src/include/simix/context.h @@ -10,7 +10,7 @@ #include "xbt/misc.h" /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions */ #include "xbt/function_types.h" /* function pointer types declarations */ #include "xbt_modinter.h" /* xbt_context_init() and xbt_context_exit() declarations */ -#include "simix/simix.h" +#include "simgrid/simix.h" SG_BEGIN_DECL() diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c index 733d2bf359..c993773be6 100644 --- a/src/msg/msg_config.c +++ b/src/msg/msg_config.c @@ -7,7 +7,7 @@ #include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" -#include "simix/simix.h" +#include "simgrid/simix.h" /** \brief set a configuration variable * diff --git a/src/msg/msg_mailbox.h b/src/msg/msg_mailbox.h index cdfe0e6ab0..851e77ce3a 100644 --- a/src/msg/msg_mailbox.h +++ b/src/msg/msg_mailbox.h @@ -8,7 +8,7 @@ #define MSG_MAILBOX_H #include "xbt/fifo.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "msg/datatypes.h" diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index c43de1e82c..b177298e02 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -8,7 +8,7 @@ #define METASIMGRID_PRIVATE_H #include "msg/msg.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" #include "xbt/dynar.h" diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index dc1fe2d194..616f669a2b 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -8,7 +8,7 @@ #include "xbt/function_types.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "simix/context.h" #include "smx_private.h" diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 55efda3f87..66d587e5a5 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -7,7 +7,7 @@ #ifndef _SIMIX_HOST_PRIVATE_H #define _SIMIX_HOST_PRIVATE_H -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "smx_smurf_private.h" /** @brief Host datatype */ diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h index f38cd9bdba..945538d5f4 100644 --- a/src/simix/smx_io_private.h +++ b/src/simix/smx_io_private.h @@ -7,7 +7,7 @@ #ifndef _SIMIX_IO_PRIVATE_H #define _SIMIX_IO_PRIVATE_H -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "smx_smurf_private.h" void SIMIX_pre_file_read(smx_simcall_t simcall); diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index ac8dcdcebb..d14ec57ce5 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -7,7 +7,7 @@ #ifndef _SIMIX_NETWORK_PRIVATE_H #define _SIMIX_NETWORK_PRIVATE_H -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "smx_smurf_private.h" /** @brief Rendez-vous point datatype */ diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 943d114a83..b19e966584 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -7,7 +7,7 @@ #ifndef _SIMIX_PRIVATE_H #define _SIMIX_PRIVATE_H -#include "simix/simix.h" +#include "simgrid/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" #include "xbt/swag.h" diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h index 1099ccaa23..a971ba3e5e 100644 --- a/src/simix/smx_process_private.h +++ b/src/simix/smx_process_private.h @@ -7,7 +7,7 @@ #ifndef _SIMIX_PROCESS_PRIVATE_H #define _SIMIX_PROCESS_PRIVATE_H -#include "simix/datatypes.h" +#include "simgrid/simix.h" #include "smx_smurf_private.h" /** @brief Process datatype */ diff --git a/src/smpi/private.h b/src/smpi/private.h index 6105faaa10..a01ffef124 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -9,7 +9,7 @@ #include "xbt.h" #include "xbt/xbt_os_time.h" -#include "simix/simix.h" +#include "simgrid/simix.h" #include "smpi/smpi.h" #include "smpi/smpif.h" #include "smpi/smpi_cocci.h" diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c index 34dba4a1cc..99517c0877 100644 --- a/src/xbt/xbt_sg_synchro.c +++ b/src/xbt/xbt_sg_synchro.c @@ -13,8 +13,7 @@ #include "xbt/synchro.h" /* This module */ -#include "simix/simix.h" /* used implementation */ -#include "simix/datatypes.h" +#include "simgrid/simix.h" /* used implementation */ #include "../simix/smx_private.h" /* FIXME */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt, diff --git a/src/xbt/xbt_sg_time.c b/src/xbt/xbt_sg_time.c index 726b0c2a9a..8a3722f3fd 100644 --- a/src/xbt/xbt_sg_time.c +++ b/src/xbt/xbt_sg_time.c @@ -7,7 +7,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Virtu/virtu_sg.h" -#include "simix/simix.h" +#include "simgrid/simix.h" /* * Time elapsed since the begining of the simulation. diff --git a/tools/gras/struct_diff.c b/tools/gras/struct_diff.c index edb9aeca97..c8758a0744 100644 --- a/tools/gras/struct_diff.c +++ b/tools/gras/struct_diff.c @@ -18,7 +18,7 @@ #include "xbt/datadesc.h" #include "xbt/file_stat.h" #include "../../src/xbt/datadesc/datadesc_private.h" // RAAAAH! ugly relative path, but it's late, I want it to be done NOW. -#include "simix/datatypes.h" +#include "simix/simix.h" #include "../../src/simix/smx_smurf_private.h" // RAAAAH! ugly relative path, but it's even later and it still doesn't work static void define_types(void) {