X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/546888e0918a3cda4cd2ffb5786f67dda3883a81..bdeb73fa38787af6728f7d01c0f6c0ae73d38b42:/src/simix/popping_private.h diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h index e8e76b7196..90ac87f707 100644 --- a/src/simix/popping_private.h +++ b/src/simix/popping_private.h @@ -1,15 +1,19 @@ -/* 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. */ -#ifndef _POPPING_PRIVATE_H -#define _POPPING_PRIVATE_H +#ifndef SG_POPPING_PRIVATE_H +#define SG_POPPING_PRIVATE_H #include #include +#include +#include + +#include + SG_BEGIN_DECL() /********************************* Simcalls *********************************/ @@ -17,8 +21,8 @@ XBT_PUBLIC_DATA(const char*) simcall_names[]; /* Name of each simcall */ #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */ -typedef int (*simix_match_func_t)(void *, void *, smx_synchro_t); -typedef void (*simix_copy_data_func_t)(smx_synchro_t, void*, size_t); +typedef int (*simix_match_func_t)(void *, void *, smx_activity_t); +typedef void (*simix_copy_data_func_t)(smx_activity_t, void*, size_t); typedef void (*simix_clean_func_t)(void *); typedef void (*FPtr)(void); // Hide the ugliness @@ -42,13 +46,14 @@ union u_smx_scalar { /** * \brief Represents a simcall to the kernel. */ -typedef struct s_smx_simcall { +struct s_smx_simcall { e_smx_simcall_t call; - smx_process_t issuer; + smx_actor_t issuer; + smx_timer_t timer; int mc_value; union u_smx_scalar args[11]; union u_smx_scalar result; -} s_smx_simcall_t, *smx_simcall_t; +}; #define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall)->mc_value = (value)) #define SIMCALL_GET_MC_VALUE(simcall) ((simcall)->mc_value) @@ -57,14 +62,29 @@ typedef struct s_smx_simcall { XBT_PRIVATE void SIMIX_simcall_answer(smx_simcall_t simcall); XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t simcall, int value); -XBT_PRIVATE void SIMIX_simcall_exit(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_simcall_exit(smx_activity_t synchro); XBT_PRIVATE const char *SIMIX_simcall_name(e_smx_simcall_t kind); XBT_PRIVATE void SIMIX_run_kernel(std::function const* code); +XBT_PRIVATE void SIMIX_run_blocking(std::function const* code); SG_END_DECL() #ifdef __cplusplus +/* Defines the marshal/unmarshal functions for each type of parameters. + * + * They will be used in popping_accessors.h to define the functions allowing + * to retrieve/set each parameter of each simcall. + * + * There is a unmarshal_raw() function, which is exactly similar to unmarshal() + * for all types but boost::intrusive_ptr(T). For that type, the unmarshal() + * function builds a new intrusive_ptr wrapping the pointer (that is stored raw + * within the simcall) while the unmarshal_raw retrieves the raw pointer. + * + * This is used in _getraw_ functions, that allow the + * model-checker, to read the data in the remote memory of the MCed. + */ + namespace simgrid { namespace simix { @@ -79,15 +99,11 @@ class type { }; template struct marshal_t {}; -#define SIMIX_MARSHAL(T, field) \ - inline void marshal(type, u_smx_scalar& simcall, T value) \ - { \ - simcall.field = value; \ - } \ - inline T unmarshal(type, u_smx_scalar const& simcall) \ - { \ - return simcall.field; \ - } +#define SIMIX_MARSHAL(T, field) \ + inline void marshal(type, u_smx_scalar& simcall, T value) { simcall.field = value; } \ + inline T unmarshal(type, u_smx_scalar const& simcall) { return simcall.field; } \ + inline T unmarshal_raw(type, u_smx_scalar const& simcall) \ + { /* Exactly same as unmarshal. It differs only for intrusive_ptr */ return simcall.field; } SIMIX_MARSHAL(char, c); SIMIX_MARSHAL(short, s); @@ -103,8 +119,12 @@ SIMIX_MARSHAL(float, d); SIMIX_MARSHAL(double, d); SIMIX_MARSHAL(FPtr, fp); -inline -void unmarshal(type, u_smx_scalar const& simcall) {} +inline void unmarshal(type, u_smx_scalar const& simcall) +{ +} +inline void unmarshal_raw(type, u_smx_scalar const& simcall) +{ +} template inline void marshal(type, u_smx_scalar& simcall, T* value) @@ -116,6 +136,31 @@ T* unmarshal(type, u_smx_scalar const& simcall) { return static_cast(simcall.dp); } +template inline T* unmarshal_raw(type, u_smx_scalar const& simcall) +{ + return static_cast(simcall.dp); +} + +template +inline void marshal(type>, u_smx_scalar& simcall, boost::intrusive_ptr value) +{ + if (value.get() == nullptr) { // Sometimes we return nullptr in an intrusive_ptr... + simcall.dp = nullptr; + } else { + intrusive_ptr_add_ref(&*value); + simcall.dp = static_cast(&*value); + } +} +template inline boost::intrusive_ptr unmarshal(type>, u_smx_scalar const& simcall) +{ + // refcount was already increased during the marshaling, thus the "false" as last argument + boost::intrusive_ptr res = boost::intrusive_ptr(static_cast(simcall.dp), false); + return res; +} +template inline T* unmarshal_raw(type>, u_smx_scalar const& simcall) +{ + return static_cast(simcall.dp); +} template inline void marshal(type, u_smx_scalar& simcall, R(*value)(T...)) @@ -127,6 +172,10 @@ auto unmarshal(type, u_smx_scalar simcall) -> R(*)(T...) { return (R(*)(T...)) simcall.fp; } +template inline auto unmarshal_raw(type, u_smx_scalar simcall) -> R (*)(T...) +{ + return (R(*)(T...))simcall.fp; +} template inline void marshal(u_smx_scalar& simcall, T const& value) @@ -138,6 +187,10 @@ typename std::remove_reference::type unmarshal(u_smx_scalar& simcall) { return unmarshal(type(), simcall); } +template inline typename std::remove_reference::type unmarshal_raw(u_smx_scalar& simcall) +{ + return unmarshal(type(), simcall); +} template inline void marshalArgs(smx_simcall_t simcall) {}