X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b52e25dc0e3d17cdbe0323f922d7bb4fc238af3..783573d576fa9ac43c007c6031bce185d882f92b:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index c101d43a2b..64f9aac67b 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ @@ -35,13 +34,13 @@ namespace context { \see m_process_management @{ */ class ActorImpl; - class Mutex; + class MutexImpl; } } typedef simgrid::kernel::context::Context* smx_context_t; typedef simgrid::simix::ActorImpl* smx_actor_t; -typedef simgrid::simix::Mutex* smx_mutex_t; +typedef simgrid::simix::MutexImpl* smx_mutex_t; typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; #else @@ -53,10 +52,6 @@ typedef struct s_smx_mailbox *smx_mailbox_t; #endif -/**************************** Scalar Values **********************************/ - -typedef union u_smx_scalar u_smx_scalar_t; - /* ******************************** Host ************************************ */ /** @brief Host datatype @ingroup simix_host_management @@ -102,7 +97,6 @@ typedef struct s_smx_file *smx_file_t; /********************************** Storage *************************************/ typedef xbt_dictelm_t smx_storage_t; -typedef struct s_smx_storage_priv *smx_storage_priv_t; /* ****************************** Process *********************************** */ @@ -116,8 +110,6 @@ typedef enum { /* Process creation/destruction callbacks */ typedef void (*void_pfn_smxprocess_t) (smx_actor_t); -/* for auto-restart function */ -typedef void (*void_pfn_sghost_t) (sg_host_t); extern int smx_context_stack_size; extern int smx_context_stack_size_was_set;