-/* Copyright (c) 2007, 2009-2014. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "surf/surf.h"
#include "simgrid/sg_config.h"
#include "simgrid/modelchecker.h"
+#include "mc/mc_replay.h"
#ifndef WIN32
#include <sys/mman.h>
void smpi_execute_flops(double flops) {
smx_synchro_t action;
- smx_host_t host;
- host = SIMIX_host_self();
XBT_DEBUG("Handle real computation time: %f flops", flops);
- action = simcall_host_execute("computation", host, flops, 1, 0, 0);
+ action = simcall_process_execute("computation", flops, 1, 0, 0);
simcall_set_category (action, TRACE_internal_smpi_get_category());
- simcall_host_execution_wait(action);
+ simcall_process_execution_wait(action);
smpi_switch_data_segment(smpi_process_index());
}
{
void* mem;
if (sg_cfg_get_boolean("smpi/use_shared_malloc")){
- char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line);
+ char *loc = bprintf("/%zu_%s_%d", (size_t)getpid(), file, line);
int fd;
shared_data_t *data;
loc = smpi_shared_alloc_hash(loc); /* hash loc, in order to have something
if(smpi_size_data_exe == 0)//no need to switch
return;
-#ifdef HAVE_MMAP
+#ifdef HAVE_PRIVATIZATION
int i;
if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here
for (i=0; i< SIMIX_process_count(); i++){
void smpi_initialize_global_memory_segments(){
-#ifndef HAVE_MMAP
+#ifndef HAVE_PRIVATIZATION
smpi_privatize_global_variables=0;
return;
#else
void smpi_destroy_global_memory_segments(){
if (smpi_size_data_exe == 0)//no need to switch
return;
-#ifdef HAVE_MMAP
+#ifdef HAVE_PRIVATIZATION
int i;
for (i=0; i< smpi_process_count(); i++){
if(munmap(smpi_privatisation_regions[i].address, smpi_size_data_exe) < 0) {