A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix https://github.com/simgrid/simgrid/issues/294
[simgrid.git]
/
src
/
simix
/
popping_private.hpp
diff --git
a/src/simix/popping_private.hpp
b/src/simix/popping_private.hpp
index
8dbbec1
..
d7742cd
100644
(file)
--- a/
src/simix/popping_private.hpp
+++ b/
src/simix/popping_private.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. 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. */
/* 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. */
@@
-6,19
+6,13
@@
#ifndef SG_POPPING_PRIVATE_HPP
#define SG_POPPING_PRIVATE_HPP
#ifndef SG_POPPING_PRIVATE_HPP
#define SG_POPPING_PRIVATE_HPP
-#include <simgrid/simix.h>
-#include <xbt/base.h>
-
-#include <src/kernel/activity/ActivityImpl.hpp>
-#include <src/kernel/activity/CommImpl.hpp>
-#include <src/kernel/activity/ExecImpl.hpp>
+#include "simgrid/forward.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
#include <boost/intrusive_ptr.hpp>
#include <boost/intrusive_ptr.hpp>
-extern "C" {
-
/********************************* Simcalls *********************************/
/********************************* Simcalls *********************************/
-XBT_PUBLIC_DATA
(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 */
#include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
@@
-45,7
+39,7
@@
union u_smx_scalar {
};
/**
};
/**
- *
\
brief Represents a simcall to the kernel.
+ *
@
brief Represents a simcall to the kernel.
*/
struct s_smx_simcall {
e_smx_simcall_t call;
*/
struct s_smx_simcall {
e_smx_simcall_t call;
@@
-67,7
+61,6
@@
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<void()> const* code);
XBT_PRIVATE void SIMIX_run_blocking(std::function<void()> const* code);
XBT_PRIVATE const char* SIMIX_simcall_name(e_smx_simcall_t kind);
XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);
XBT_PRIVATE void SIMIX_run_blocking(std::function<void()> const* code);
-}
/* Defines the marshal/unmarshal functions for each type of parameters.
*
/* Defines the marshal/unmarshal functions for each type of parameters.
*
@@
-143,8
+136,8
@@
inline void marshal(type<boost::intrusive_ptr<T>>, u_smx_scalar& simcall, boost:
if (value.get() == nullptr) { // Sometimes we return nullptr in an intrusive_ptr...
simcall.dp = nullptr;
} else {
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<void*>(
&*value
);
+ intrusive_ptr_add_ref(
value.get()
);
+ simcall.dp = static_cast<void*>(
value.get()
);
}
}
template <class T> inline boost::intrusive_ptr<T> unmarshal(type<boost::intrusive_ptr<T>>, u_smx_scalar const& simcall)
}
}
template <class T> inline boost::intrusive_ptr<T> unmarshal(type<boost::intrusive_ptr<T>>, u_smx_scalar const& simcall)
@@
-186,6
+179,7
@@
template <class T> inline typename std::remove_reference<T>::type unmarshal_raw(
template <std::size_t I> inline void marshalArgs(smx_simcall_t simcall)
{
template <std::size_t I> inline void marshalArgs(smx_simcall_t simcall)
{
+ /* Nothing to do when no args */
}
template <std::size_t I, class A> inline void marshalArgs(smx_simcall_t simcall, A const& a)
}
template <std::size_t I, class A> inline void marshalArgs(smx_simcall_t simcall, A const& a)