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
remove a useless assert: valgrind will tell us on need
[simgrid.git]
/
src
/
kernel
/
context
/
Context.cpp
diff --git
a/src/kernel/context/Context.cpp
b/src/kernel/context/Context.cpp
index 29393ea87ecb43fb6beaa44e1beab5e1f970b0a9..1a9dae5cbc0a90ce0217142e70c13a2cbd67d0c7 100644
(file)
--- a/
src/kernel/context/Context.cpp
+++ b/
src/kernel/context/Context.cpp
@@
-1,27
+1,12
@@
-/* 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. */
/* 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. */
-#include <cstdint>
-
-#include <memory>
-#include <functional>
-#include <utility>
-
-#include <simgrid/simix.hpp>
-
#include "mc/mc.h"
#include "src/kernel/context/Context.hpp"
#include "mc/mc.h"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
-
-void SIMIX_process_set_cleanup_function(
- smx_process_t process, void_pfn_smxprocess_t cleanup)
-{
- process->context->set_cleanup(cleanup);
-}
+#include "src/simix/smx_private.hpp"
/**
* @brief creates a new context for a user level process
/**
* @brief creates a new context for a user level process
@@
-31,10
+16,9
@@
void SIMIX_process_set_cleanup_function(
smx_context_t SIMIX_context_new(
std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
smx_context_t SIMIX_context_new(
std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
- smx_
process
_t simix_process)
+ smx_
actor
_t simix_process)
{
{
- if (!simix_global)
- xbt_die("simix is not initialized, please call MSG_init first");
+ xbt_assert(simix_global, "simix is not initialized, please call MSG_init first");
return simix_global->context_factory->create_context(
std::move(code), cleanup_func, simix_process);
}
return simix_global->context_factory->create_context(
std::move(code), cleanup_func, simix_process);
}
@@
-45,7
+29,7
@@
namespace context {
ContextFactoryInitializer factory_initializer = nullptr;
ContextFactoryInitializer factory_initializer = nullptr;
-ContextFactory::~ContextFactory()
{}
+ContextFactory::~ContextFactory()
= default;
Context* ContextFactory::self()
{
Context* ContextFactory::self()
{
@@
-54,27
+38,27
@@
Context* ContextFactory::self()
void ContextFactory::declare_context(void* context, std::size_t size)
{
void ContextFactory::declare_context(void* context, std::size_t size)
{
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
/* Store the address of the stack in heap to compare it apart of heap comparison */
if(MC_is_active())
MC_ignore_heap(context, size);
#endif
}
/* Store the address of the stack in heap to compare it apart of heap comparison */
if(MC_is_active())
MC_ignore_heap(context, size);
#endif
}
-Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_
process
_t process)
+Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_
actor
_t process)
{
xbt_die("Cannot attach with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
{
xbt_die("Cannot attach with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context* ContextFactory::create_maestro(std::function<void()> code, smx_
process
_t process)
+Context* ContextFactory::create_maestro(std::function<void()> code, smx_
actor
_t process)
{
xbt_die("Cannot create_maestro with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
Context::Context(std::function<void()> code,
{
xbt_die("Cannot create_maestro with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
Context::Context(std::function<void()> code,
- void_pfn_smxprocess_t cleanup_func, smx_
process
_t process)
+ void_pfn_smxprocess_t cleanup_func, smx_
actor
_t process)
: code_(std::move(code)), process_(process), iwannadie(false)
{
/* If the user provided a function for the process then use it.
: code_(std::move(code)), process_(process), iwannadie(false)
{
/* If the user provided a function for the process then use it.
@@
-86,9
+70,7
@@
Context::Context(std::function<void()> code,
SIMIX_context_set_current(this);
}
SIMIX_context_set_current(this);
}
-Context::~Context()
-{
-}
+Context::~Context() = default;
void Context::stop()
{
void Context::stop()
{
@@
-101,21
+83,18
@@
void Context::stop()
this->iwannadie = true;
}
this->iwannadie = true;
}
-AttachContext::~AttachContext()
-{
-}
+AttachContext::~AttachContext() = default;
}}}
/** @brief Executes all the processes to run (in parallel if possible). */
}}}
/** @brief Executes all the processes to run (in parallel if possible). */
-void SIMIX_context_runall(
void
)
+void SIMIX_context_runall()
{
{
- if (!xbt_dynar_is_empty(simix_global->process_to_run))
- simix_global->context_factory->run_all();
+ simix_global->context_factory->run_all();
}
/** @brief returns the current running context */
}
/** @brief returns the current running context */
-smx_context_t SIMIX_context_self(
void
)
+smx_context_t SIMIX_context_self()
{
if (simix_global && simix_global->context_factory)
return simix_global->context_factory->self();
{
if (simix_global && simix_global->context_factory)
return simix_global->context_factory->self();