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
Use real pointer type for context wrappers.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextThread.hpp
diff --git
a/src/kernel/context/ContextThread.hpp
b/src/kernel/context/ContextThread.hpp
index
f47f59f
..
22e3814
100644
(file)
--- a/
src/kernel/context/ContextThread.hpp
+++ b/
src/kernel/context/ContextThread.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2009-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2019. 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. */
@@
-9,47
+8,53
@@
#ifndef SIMGRID_SIMIX_THREAD_CONTEXT_HPP
#define SIMGRID_SIMIX_THREAD_CONTEXT_HPP
#ifndef SIMGRID_SIMIX_THREAD_CONTEXT_HPP
#define SIMGRID_SIMIX_THREAD_CONTEXT_HPP
-#include <simgrid/simix.hpp>
+#include "simgrid/simix.hpp"
+#include "src/kernel/context/Context.hpp"
+#include "src/xbt/OsSemaphore.hpp"
+#include <thread>
namespace simgrid {
namespace kernel {
namespace context {
namespace simgrid {
namespace kernel {
namespace context {
-class ThreadContext : public AttachContext {
+class
XBT_PUBLIC
ThreadContext : public AttachContext {
public:
public:
- ThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, bool maestro);
+ ThreadContext(std::function<void()> code, smx_actor_t actor, bool maestro);
+ ThreadContext(const ThreadContext&) = delete;
+ ThreadContext& operator=(const ThreadContext&) = delete;
~ThreadContext() override;
void stop() override;
void suspend() override;
void attach_start() override;
void attach_stop() override;
~ThreadContext() override;
void stop() override;
void suspend() override;
void attach_start() override;
void attach_stop() override;
- bool is
M
aestro() const { return is_maestro_; }
+ bool is
_m
aestro() const { return is_maestro_; }
void release(); // unblock context's start()
void wait(); // wait for context's yield()
private:
/** A portable thread */
void release(); // unblock context's start()
void wait(); // wait for context's yield()
private:
/** A portable thread */
-
xbt_os_thread_t
thread_ = nullptr;
- /** Semaphore used to schedule/yield the
process
*/
- xbt
_os_sem_t begin_ = nullptr
;
- /** Semaphore used to schedule/unschedule */
- xbt
_os_sem_t end_ = nullptr
;
+
std::thread*
thread_ = nullptr;
+ /** Semaphore used to schedule/yield the
actor (not needed when the maestro is in main, but harmless then)
*/
+ xbt
::OsSemaphore begin_{0}
;
+ /** Semaphore used to schedule/unschedule
(not needed when the maestro is in main, but harmless then)
*/
+ xbt
::OsSemaphore end_{0}
;
bool is_maestro_;
void start(); // match a call to release()
void yield(); // match a call to yield()
bool is_maestro_;
void start(); // match a call to release()
void yield(); // match a call to yield()
- virtual void start_hook() {} // called after start()
- virtual void yield_hook() {} // called before yield()
+ virtual void start_hook() { /* empty placeholder, called after start(). Used in parallel mode and Java */}
+ virtual void yield_hook() { /* empty placeholder, called before yield(). Used in parallel mode */}
+ virtual void stop_hook() { /* empty placeholder, called at stop(). Used in Java */}
- static void
* wrapper(void *param
);
+ static void
wrapper(ThreadContext* context
);
};
};
-class SerialThreadContext : public ThreadContext {
+class
XBT_PUBLIC
SerialThreadContext : public ThreadContext {
public:
public:
- SerialThreadContext(std::function<void()> code,
void_pfn_smxprocess_t cleanup_func, smx_actor_t process
, bool maestro)
- : ThreadContext(std::move(code),
cleanup_func, process
, maestro)
+ SerialThreadContext(std::function<void()> code,
smx_actor_t actor
, bool maestro)
+ : ThreadContext(std::move(code),
actor
, maestro)
{
}
{
}
@@
-58,9
+63,8
@@
public:
class ParallelThreadContext : public ThreadContext {
public:
class ParallelThreadContext : public ThreadContext {
public:
- ParallelThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- bool maestro)
- : ThreadContext(std::move(code), cleanup_func, process, maestro)
+ ParallelThreadContext(std::function<void()> code, smx_actor_t actor, bool maestro)
+ : ThreadContext(std::move(code), actor, maestro)
{
}
{
}
@@
-69,7
+73,7
@@
public:
static void run_all();
private:
static void run_all();
private:
- static xbt
_os_sem_t
thread_sem_;
+ static xbt
::OsSemaphore*
thread_sem_;
void start_hook() override;
void yield_hook() override;
void start_hook() override;
void yield_hook() override;
@@
-78,31
+82,27
@@
private:
class ThreadContextFactory : public ContextFactory {
public:
ThreadContextFactory();
class ThreadContextFactory : public ContextFactory {
public:
ThreadContextFactory();
+ ThreadContextFactory(const ThreadContextFactory&) = delete;
+ ThreadContextFactory& operator=(const ThreadContextFactory&) = delete;
~ThreadContextFactory() override;
~ThreadContextFactory() override;
- ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
- smx_actor_t process) override
+ ThreadContext* create_context(std::function<void()> code, smx_actor_t actor) override
{
bool maestro = not code;
{
bool maestro = not code;
- return create_context(std::move(code),
cleanup_func, process
, maestro);
+ return create_context(std::move(code),
actor
, maestro);
}
void run_all() override;
}
void run_all() override;
- ThreadContext* self() override { return static_cast<ThreadContext*>(xbt_os_thread_get_extra_data()); }
// Optional methods:
// Optional methods:
- ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process) override
+ ThreadContext* attach(smx_actor_t actor) override { return create_context(std::function<void()>(), actor, false); }
+ ThreadContext* create_maestro(std::function<void()> code, smx_actor_t actor) override
{
{
- return create_context(std::function<void()>(), cleanup_func, process, false);
- }
- ThreadContext* create_maestro(std::function<void()> code, smx_actor_t process) override
- {
- return create_context(std::move(code), nullptr, process, true);
+ return create_context(std::move(code), actor, true);
}
private:
bool parallel_;
}
private:
bool parallel_;
- ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- bool maestro);
+ ThreadContext* create_context(std::function<void()> code, smx_actor_t actor, bool maestro);
};
}}} // namespace
};
}}} // namespace