-/* 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
#ifndef _POPPING_PRIVATE_H
#define _POPPING_PRIVATE_H
+#include <xbt/base.h>
+#include <simgrid/simix.h>
+
SG_BEGIN_DECL()
/********************************* Simcalls *********************************/
-XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
+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_action_t);
-typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
+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 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;
-#ifdef HAVE_MC
int mc_value;
-#endif
union u_smx_scalar args[11];
union u_smx_scalar result;
-} s_smx_simcall_t, *smx_simcall_t;
+};
-#if HAVE_MC
#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall)->mc_value = (value))
#define SIMCALL_GET_MC_VALUE(simcall) ((simcall)->mc_value)
-#else
-#define SIMCALL_SET_MC_VALUE(simcall, value) ((void)0)
-#define SIMCALL_GET_MC_VALUE(simcall) 0
-#endif
-
-#include "popping_accessors.h"
/******************************** General *************************************/
-void SIMIX_simcall_answer(smx_simcall_t);
-void SIMIX_simcall_handle(smx_simcall_t, int);
-void SIMIX_simcall_exit(smx_action_t);
-const char *SIMIX_simcall_name(e_smx_simcall_t kind);
-//FIXME put it in a better place
-xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name);
+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 const char *SIMIX_simcall_name(e_smx_simcall_t kind);
+XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);
SG_END_DECL()
+#ifdef __cplusplus
+
+namespace simgrid {
+namespace simix {
+
+template<class T>
+class type {
+ constexpr bool operator==(type) const { return true; }
+ template<class U>
+ constexpr bool operator==(type<U>) const { return false; }
+ constexpr bool operator!=(type) const { return false; }
+ template<class U>
+ constexpr bool operator!=(type<U>) const { return true; }
+};
+
+template<typename T> struct marshal_t {};
+#define SIMIX_MARSHAL(T, field) \
+ inline void marshal(type<T>, u_smx_scalar& simcall, T value) \
+ { \
+ simcall.field = value; \
+ } \
+ inline T unmarshal(type<T>, u_smx_scalar const& simcall) \
+ { \
+ return simcall.field; \
+ }
+
+SIMIX_MARSHAL(char, c);
+SIMIX_MARSHAL(short, s);
+SIMIX_MARSHAL(int, i);
+SIMIX_MARSHAL(long, l);
+SIMIX_MARSHAL(unsigned char, uc);
+SIMIX_MARSHAL(unsigned short, us);
+SIMIX_MARSHAL(unsigned int, ui);
+SIMIX_MARSHAL(unsigned long, ul);
+SIMIX_MARSHAL(unsigned long long, ull);
+SIMIX_MARSHAL(long long, ll);
+SIMIX_MARSHAL(float, d);
+SIMIX_MARSHAL(double, d);
+SIMIX_MARSHAL(FPtr, fp);
+
+inline
+void unmarshal(type<void>, u_smx_scalar const& simcall) {}
+
+template<class T> inline
+void marshal(type<T*>, u_smx_scalar& simcall, T* value)
+{
+ simcall.dp = (void*) value;
+}
+template<class T> inline
+T* unmarshal(type<T*>, u_smx_scalar const& simcall)
+{
+ return static_cast<T*>(simcall.dp);
+}
+
+template<class R, class... T> inline
+void marshal(type<R(*)(T...)>, u_smx_scalar& simcall, R(*value)(T...))
+{
+ simcall.fp = (FPtr) value;
+}
+template<class R, class... T> inline
+auto unmarshal(type<R(*)(T...)>, u_smx_scalar simcall) -> R(*)(T...)
+{
+ return (R(*)(T...)) simcall.fp;
+}
+
+template<class T> inline
+void marshal(u_smx_scalar& simcall, T const& value)
+{
+ return marshal(type<T>(), simcall, value);
+}
+template<class T> inline
+typename std::remove_reference<T>::type unmarshal(u_smx_scalar& simcall)
+{
+ return unmarshal(type<T>(), simcall);
+}
+
+template<std::size_t I>
+inline void marshalArgs(smx_simcall_t simcall) {}
+
+template<std::size_t I, class A>
+inline void marshalArgs(smx_simcall_t simcall, A const& a)
+{
+ marshal(simcall->args[I], a);
+}
+
+template<std::size_t I, class A, class... B>
+inline void marshalArgs(smx_simcall_t simcall, A const& a, B const&... b)
+{
+ marshal(simcall->args[I], a);
+ marshalArgs<I+1>(simcall, b...);
+}
+
+/** Initialize the simcall */
+template<class... A> 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));
+ memset(simcall->args, 0, sizeof(simcall->args));
+ marshalArgs<0>(simcall, a...);
+}
+
+}
+}
+
+#endif
+
+#include "popping_accessors.h"
+
#endif