X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5954f11308de69ea37c6f6fdd993925f90749984..17a02864e7ac2f0a531712199939b4fb4282d438:/src/simix/popping_private.h diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h index 71bd4ed173..abbc7566cf 100644 --- a/src/simix/popping_private.h +++ b/src/simix/popping_private.h @@ -1,11 +1,10 @@ -/* 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 @@ -17,55 +16,51 @@ 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 /* Pack all possible scalar types in an union */ union u_smx_scalar { char c; - const char* cc; short s; int i; long l; + long long ll; unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul; - float f; + unsigned long long ull; double d; - size_t sz; - sg_size_t sgsz; - sg_offset_t sgoff; void* dp; FPtr fp; - const void* cp; }; /** * \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) -#include "popping_accessors.h" - /******************************** General *************************************/ -XBT_PRIVATE void SIMIX_simcall_answer(smx_simcall_t); -XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t, int); -XBT_PRIVATE void SIMIX_simcall_exit(smx_synchro_t); +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_activity_t synchro); XBT_PRIVATE const char *SIMIX_simcall_name(e_smx_simcall_t kind); -XBT_PRIVATE void SIMIX_run_kernel(void* code); +XBT_PRIVATE void SIMIX_run_kernel(std::function const* code); +XBT_PRIVATE void SIMIX_run_blocking(std::function const* code); SG_END_DECL() @@ -74,18 +69,26 @@ SG_END_DECL() namespace simgrid { namespace simix { +template +class type { + constexpr bool operator==(type) const { return true; } + template + constexpr bool operator==(type) const { return false; } + constexpr bool operator!=(type) const { return false; } + template + constexpr bool operator!=(type) const { return true; } +}; + template struct marshal_t {}; #define SIMIX_MARSHAL(T, field) \ - template<> struct marshal_t { \ - static void marshal(u_smx_scalar& simcall, T value) \ - { \ - simcall.field = value; \ - } \ - static T unmarshal(u_smx_scalar const& simcall) \ - { \ - return simcall.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; \ + } SIMIX_MARSHAL(char, c); SIMIX_MARSHAL(short, s); @@ -95,150 +98,72 @@ SIMIX_MARSHAL(unsigned char, uc); SIMIX_MARSHAL(unsigned short, us); SIMIX_MARSHAL(unsigned int, ui); SIMIX_MARSHAL(unsigned long, ul); -SIMIX_MARSHAL(float, f); +SIMIX_MARSHAL(unsigned long long, ull); +SIMIX_MARSHAL(long long, ll); +SIMIX_MARSHAL(float, d); SIMIX_MARSHAL(double, d); SIMIX_MARSHAL(FPtr, fp); -template struct marshal_t { - static void marshal(u_smx_scalar& simcall, T* value) - { - simcall.dp = value; - } - static T* unmarshal(u_smx_scalar const& simcall) - { - return simcall.dp; - } -}; - -template<> struct marshal_t { - static void unmarshal(u_smx_scalar const& simcall) {} -}; +inline +void unmarshal(type, u_smx_scalar const& simcall) {} template inline -void marshal(u_smx_scalar& simcall, T const& value) +void marshal(type, u_smx_scalar& simcall, T* value) { - marshal_t::marshal(simcall, value); + simcall.dp = (void*) value; } - template inline -T unmarshal(u_smx_scalar const& simcall) +T* unmarshal(type, u_smx_scalar const& simcall) { - return marshal_t::unmarshal(simcall); + return static_cast(simcall.dp); } -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A&& a) +template inline +void marshal(type, u_smx_scalar& simcall, R(*value)(T...)) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); + simcall.fp = (FPtr) value; } - -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A&& a, B&& b) +template inline +auto unmarshal(type, u_smx_scalar simcall) -> R(*)(T...) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); + return (R(*)(T...)) simcall.fp; } -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A&& a, B&& b, C&& c) -{ - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); -} - -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A&& a, B&& b, C&& c, D&& d) +template inline +void marshal(u_smx_scalar& simcall, T const& value) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); + return marshal(type(), simcall, value); } - -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A&& a, B&& b, C&& c, D&& d, E&& e) +template inline +typename std::remove_reference::type unmarshal(u_smx_scalar& simcall) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); - marshal(simcall->args[4], std::forward(e)); + return unmarshal(type(), simcall); } -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, - A&& a, B&& b, C&& c, D&& d, E&& e, F&& f) -{ - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); - marshal(simcall->args[4], std::forward(e)); - marshal(simcall->args[5], std::forward(f)); -} +template +inline void marshalArgs(smx_simcall_t simcall) {} -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, - A&& a, B&& b, C&& c, D&& d, E&& e, F&& f, G&& g) +template +inline void marshalArgs(smx_simcall_t simcall, A const& a) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); - marshal(simcall->args[4], std::forward(e)); - marshal(simcall->args[5], std::forward(f)); - marshal(simcall->args[6], std::forward(g)); + marshal(simcall->args[I], a); } -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, - A&& a, B&& b, C&& c, D&& d, E&& e, F&& f, G&& g, H&& h) +template +inline void marshalArgs(smx_simcall_t simcall, A const& a, B const&... b) { - simcall->call = call; - memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); - marshal(simcall->args[4], std::forward(e)); - marshal(simcall->args[5], std::forward(f)); - marshal(simcall->args[6], std::forward(g)); - marshal(simcall->args[7], std::forward(h)); + marshal(simcall->args[I], a); + marshalArgs(simcall, b...); } -template inline -void marshal(smx_simcall_t simcall, e_smx_simcall_t call, - A&& a, B&& b, C&& c, D&& d, E&& e, F&& f, G&& g, H&& h, I&& i) +/** Initialize the simcall */ +template inline +void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A const&... a) { simcall->call = call; memset(&simcall->result, 0, sizeof(simcall->result)); - marshal(simcall->args[0], std::forward(a)); - marshal(simcall->args[1], std::forward(b)); - marshal(simcall->args[2], std::forward(c)); - marshal(simcall->args[3], std::forward(d)); - marshal(simcall->args[4], std::forward(e)); - marshal(simcall->args[5], std::forward(f)); - marshal(simcall->args[6], std::forward(g)); - marshal(simcall->args[7], std::forward(h)); - marshal(simcall->args[8], std::forward(i)); + memset(simcall->args, 0, sizeof(simcall->args)); + marshalArgs<0>(simcall, a...); } } @@ -246,4 +171,6 @@ void marshal(smx_simcall_t simcall, e_smx_simcall_t call, #endif +#include "popping_accessors.h" + #endif