X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7d7d4a985338bffc0574da0889c604489a84c13..e798113213523f9bafbcb59805ed2545a3716261:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index b061c5da59..593cf07f9e 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team. +/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,12 +22,10 @@ #include "smx_host_private.h" #include "smx_io_private.h" #include "smx_network_private.h" -#include "smx_smurf_private.h" +#include "popping_private.h" #include "smx_synchro_private.h" -/* ****************************************************************************************** */ -/* TUTORIAL: New API */ -/* ****************************************************************************************** */ -#include "smx_new_api_private.h" + +SG_BEGIN_DECL() /* Define only for SimGrid benchmarking purposes */ //#define TIME_BENCH_PER_SR /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */ @@ -49,28 +47,25 @@ typedef struct s_smx_global { xbt_dict_t registered_functions; smx_creation_func_t create_process_function; void_pfn_smxprocess_t_smxprocess_t kill_process_function; + /** Callback used when killing a SMX_process */ void_pfn_smxprocess_t cleanup_process_function; - xbt_mallocator_t action_mallocator; - void_pfn_smxhost_t autorestart; + xbt_mallocator_t synchro_mallocator; + void_pfn_sghost_t autorestart; #ifdef TIME_BENCH_AMDAHL xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */ xbt_os_timer_t timer_par; #endif + + xbt_os_mutex_t mutex; } s_smx_global_t, *smx_global_t; -extern smx_global_t simix_global; +XBT_PUBLIC_DATA(smx_global_t) simix_global; extern unsigned long simix_process_maxpid; extern xbt_dict_t watched_hosts_lib; -#ifdef __cplusplus -extern "C" { -#endif XBT_PUBLIC(void) SIMIX_clean(void); -#ifdef __cplusplus -} -#endif /******************************** Exceptions *********************************/ /** @brief Ask to the provided simix process to raise the provided exception */ @@ -98,21 +93,17 @@ typedef struct s_smx_timer { void* args; } s_smx_timer_t; -/********************************* Action *************************************/ +/********************************* synchro *************************************/ typedef enum { - SIMIX_ACTION_EXECUTE, - SIMIX_ACTION_PARALLEL_EXECUTE, - SIMIX_ACTION_COMMUNICATE, - SIMIX_ACTION_JOIN, - SIMIX_ACTION_SLEEP, - SIMIX_ACTION_SYNCHRO, - SIMIX_ACTION_IO, - /* ****************************************************************************************** */ - /* TUTORIAL: New API */ - /* ****************************************************************************************** */ - SIMIX_ACTION_NEW_API -} e_smx_action_type_t; + SIMIX_SYNC_EXECUTE, + SIMIX_SYNC_PARALLEL_EXECUTE, + SIMIX_SYNC_COMMUNICATE, + SIMIX_SYNC_JOIN, + SIMIX_SYNC_SLEEP, + SIMIX_SYNC_SYNCHRO, + SIMIX_SYNC_IO, +} e_smx_synchro_type_t; typedef enum { SIMIX_COMM_SEND, @@ -128,19 +119,19 @@ typedef enum { SIMIX_IO_STAT } e_smx_io_type_t; -/** @brief Action datatype */ -typedef struct s_smx_action { +/** @brief synchro datatype */ +typedef struct s_smx_synchro { - e_smx_action_type_t type; /* Type of SIMIX action*/ - e_smx_state_t state; /* State of the action */ - char *name; /* Action name if any */ - xbt_fifo_t simcalls; /* List of simcalls waiting for this action */ + e_smx_synchro_type_t type; /* Type of SIMIX synchro */ + e_smx_state_t state; /* State of the synchro */ + char *name; /* synchro name if any */ + xbt_fifo_t simcalls; /* List of simcalls waiting for this synchro */ - /* Data specific to each action type */ + /* Data specific to each synchro type */ union { struct { - smx_host_t host; /* The host where the execution takes place */ + sg_host_t host; /* The host where the execution takes place */ surf_action_t surf_exec; /* The Surf execution action encapsulated */ } execution; /* Possibly parallel execution */ @@ -157,10 +148,10 @@ typedef struct s_smx_action { int detached; /* If detached or not */ void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */ - int (*match_fun)(void*,void*,smx_action_t); /* Filter function used by the other side. It is used when + int (*match_fun)(void*,void*,smx_synchro_t); /* Filter function used by the other side. It is used when looking if a given communication matches my needs. For that, myself must match the expectations of the other side, too. See */ - void (*copy_data_fun) (smx_action_t, void*, size_t); + void (*copy_data_fun) (smx_synchro_t, void*, size_t); /* Surf action data */ surf_action_t surf_comm; /* The Surf communication action encapsulated */ @@ -183,7 +174,7 @@ typedef struct s_smx_action { } comm; struct { - smx_host_t host; /* The host that is sleeping */ + sg_host_t host; /* The host that is sleeping */ surf_action_t surf_sleep; /* The Surf sleeping action encapsulated */ } sleep; @@ -192,26 +183,17 @@ typedef struct s_smx_action { } synchro; struct { - smx_host_t host; + sg_host_t host; surf_action_t surf_io; } io; - - /* ****************************************************************************************** */ - /* TUTORIAL: New API */ - /* ****************************************************************************************** */ - struct { - surf_action_t surf_new_api; - } new_api; }; #ifdef HAVE_LATENCY_BOUND_TRACKING int latency_limited; #endif -#ifdef HAVE_TRACING char *category; /* simix action category for instrumentation */ -#endif -} s_smx_action_t; +} s_smx_synchro_t; void SIMIX_context_mod_init(void); void SIMIX_context_mod_exit(void); @@ -241,6 +223,7 @@ smx_context_t SIMIX_context_get_current(void); void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory); void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); +void SIMIX_ctx_boost_factory_init(smx_context_factory_t *factory); /* ****************************** */ /* context manipulation functions */ @@ -348,4 +331,6 @@ XBT_PUBLIC(int) SIMIX_process_get_maxpid(void); void SIMIX_post_create_environment(void); +SG_END_DECL() + #endif