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
try to use more standard, less obscure synchro for refcounting
[simgrid.git]
/
src
/
simix
/
ActorImpl.hpp
diff --git
a/src/simix/ActorImpl.hpp
b/src/simix/ActorImpl.hpp
index
de7ad9e
..
9e4930d
100644
(file)
--- a/
src/simix/ActorImpl.hpp
+++ b/
src/simix/ActorImpl.hpp
@@
-3,13
+3,13
@@
/* 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. */
-#ifndef
_
SIMIX_ACTORIMPL_H
-#define
_
SIMIX_ACTORIMPL_H
+#ifndef SIMIX_ACTORIMPL_H
+#define SIMIX_ACTORIMPL_H
#include "simgrid/s4u/Actor.hpp"
#include "src/simix/popping_private.h"
#include "simgrid/s4u/Actor.hpp"
#include "src/simix/popping_private.h"
-#include "xbt/fifo.h"
#include "xbt/swag.h"
#include "xbt/swag.h"
+#include<list>
typedef struct s_smx_process_exit_fun {
int_f_pvoid_pvoid_t fun;
typedef struct s_smx_process_exit_fun {
int_f_pvoid_pvoid_t fun;
@@
-41,10
+41,10
@@
public:
s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr }; /* simix_global->process_to_destroy */
unsigned long pid = 0;
s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr }; /* simix_global->process_to_destroy */
unsigned long pid = 0;
- unsigned long ppid =
0
;
+ unsigned long ppid =
-1
;
simgrid::xbt::string name;
const char* cname() { return name.c_str(); }
simgrid::xbt::string name;
const char* cname() { return name.c_str(); }
- s
g_host_t host
= nullptr; /* the host on which the process is running */
+ s
4u::Host* host
= nullptr; /* the host on which the process is running */
smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
// TODO, pack them
smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
// TODO, pack them
@@
-56,38
+56,41
@@
public:
sg_host_t new_host = nullptr; /* if not null, the host on which the process must migrate to */
smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
sg_host_t new_host = nullptr; /* if not null, the host on which the process must migrate to */
smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
-
xbt_fifo_t comms = nullptr;
/* the current non-blocking communication synchros */
+
std::list<smx_activity_t> comms ;
/* the current non-blocking communication synchros */
xbt_dict_t properties = nullptr;
s_smx_simcall_t simcall;
void *data = nullptr; /* kept for compatibility, it should be replaced with moddata */
xbt_dict_t properties = nullptr;
s_smx_simcall_t simcall;
void *data = nullptr; /* kept for compatibility, it should be replaced with moddata */
-
xbt_dynar_t on_exit = nullptr
; /* list of functions executed when the process dies */
+
std::vector<s_smx_process_exit_fun_t> on_exit
; /* list of functions executed when the process dies */
std::function<void()> code;
smx_timer_t kill_timer = nullptr;
std::function<void()> code;
smx_timer_t kill_timer = nullptr;
- int segment_index
= 0
; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
+ int segment_index
= -1
; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
friend void intrusive_ptr_add_ref(ActorImpl* process)
{
friend void intrusive_ptr_add_ref(ActorImpl* process)
{
- // Atomic operation! Do not split in two instructions!
- auto previous = (process->refcount_)++;
- xbt_assert(previous != 0);
- (void) previous;
+ process->refcount_.fetch_add(1, std::memory_order_relaxed);
}
friend void intrusive_ptr_release(ActorImpl* process)
{
}
friend void intrusive_ptr_release(ActorImpl* process)
{
- //
Atomic operation! Do not split in two instructions!
- auto count = --(process->refcount_);
- if (count == 0)
+ //
inspired from http://www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html
+ if (process->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+ std::atomic_thread_fence(std::memory_order_acquire);
delete process;
delete process;
+ }
}
~ActorImpl();
}
~ActorImpl();
- simgrid::s4u::Actor& getIface() { return piface_; }
+ simgrid::s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); }
+ simgrid::s4u::Actor* ciface() { return &piface_; }
+
+ void daemonize();
+ bool isDaemon();
private:
private:
+ bool daemon = false;
std::atomic_int_fast32_t refcount_ { 1 };
std::atomic_int_fast32_t refcount_ { 1 };
- simgrid::s4u::Actor piface_;
+ simgrid::s4u::Actor piface_;
// Our interface is part of ourselves
};
}
};
}
@@
-105,7
+108,6
@@
XBT_PRIVATE smx_actor_t SIMIX_process_create(
void *data,
sg_host_t host,
xbt_dict_t properties,
void *data,
sg_host_t host,
xbt_dict_t properties,
- int auto_restart,
smx_actor_t parent_process);
XBT_PRIVATE void SIMIX_process_runall();
smx_actor_t parent_process);
XBT_PRIVATE void SIMIX_process_runall();