#include <cassert>
#include <cstdlib>
+#include <vector>
+
#include <xbt/log.h>
-#include <xbt/dynar.h>
#include <xbt/str.h>
#include <xbt/swag.h>
return process_info;
}
-/** Load the remote swag of processes into a dynar
+/** Load the remote swag of processes into a vector
*
* @param process MCed process
- * @param target Local dynar (to be filled with copies of `s_smx_process_t`)
+ * @param target Local vector (to be filled with copies of `s_smx_process_t`)
* @param remote_swag Address of the process SWAG in the remote list
*/
static void MC_process_refresh_simix_process_list(
s_xbt_swag_t swag;
process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
- // Load each element of the dynar from the MCed process:
+ // Load each element of the vector from the MCed process:
int i = 0;
for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
void Process::refresh_simix()
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
- if (this->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
+ if (this->cache_flags_ & Process::cache_simix_processes)
return;
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
MC_process_refresh_simix_process_list(
this, this->smx_old_process_infos, simix_global.process_to_destroy);
- this->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+ this->cache_flags_ |= Process::cache_simix_processes;
}
}
* @param process the MCed process
* @param req the simcall (copied in the local process)
*/
-smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
+smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
{
if (mc_mode == MC_MODE_CLIENT)
return req->issuer;
return nullptr;
simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
- if (info->name.empty()) {
- char* name = process->read_string(p->name);
- info->name = name;
- free(name);
- }
+ if (info->name.empty())
+ info->name = process->read_string(p->name);
return info->name.c_str();
}