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
Update copyright lines for 2023.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextUnix.cpp
diff --git
a/src/kernel/context/ContextUnix.cpp
b/src/kernel/context/ContextUnix.cpp
index
92a541f
..
97e8a51
100644
(file)
--- a/
src/kernel/context/ContextUnix.cpp
+++ b/
src/kernel/context/ContextUnix.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
3
. 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. */
@@
-8,12
+8,11
@@
#include "mc/mc.h"
#include "simgrid/Exception.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "mc/mc.h"
#include "simgrid/Exception.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
-#include "src/mc/mc_ignore.hpp"
-#include "src/simix/smx_private.hpp"
+#include "src/mc/remote/AppSide.hpp"
#include "ContextUnix.hpp"
#include "ContextUnix.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
simix
_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
ker
_context);
/** Up to two integers may be needed to store a pointer on the system we target */
constexpr int CTX_ADDR_LEN = 2;
/** Up to two integers may be needed to store a pointer on the system we target */
constexpr int CTX_ADDR_LEN = 2;
@@
-33,9
+32,7
@@
XBT_ATTRIB_NORETURN static void sysv_ctx_wrapper(int i1, int i2)
}
}
}
}
-namespace simgrid {
-namespace kernel {
-namespace context {
+namespace simgrid::kernel::context {
// UContextFactory
UContext* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
// UContextFactory
UContext* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
@@
-65,9
+62,8
@@
UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, Swappe
makecontext(&this->uc_, (void (*)())sysv_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]);
#if SIMGRID_HAVE_MC
makecontext(&this->uc_, (void (*)())sysv_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]);
#if SIMGRID_HAVE_MC
- if (MC_is_active()) {
- MC_register_stack_area(get_stack(), &(this->uc_), smx_context_stack_size);
- }
+ if (MC_is_active())
+ simgrid::mc::AppSide::get()->declare_stack(get_stack(), stack_size, &uc_);
#endif
}
}
#endif
}
}
@@
-84,6
+80,4
@@
XBT_PRIVATE ContextFactory* sysv_factory()
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::context