[mc] Remove compatibility stuff

[simgrid.git] / src / mc / mc_comm_determinism.cpp

diff --git a/src/mc/mc_comm_determinism.cpp b/src/mc/mc_comm_determinism.cpp
index eb87892..20236c1 100644 (file)
--- a/src/mc/mc_comm_determinism.cpp
+++ b/src/mc/mc_comm_determinism.cpp
@@ -91,8 +91,8 @@ static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int p
 static void update_comm_pattern(mc_comm_pattern_t comm_pattern, smx_synchro_t comm_addr)
 {
   s_smx_synchro_t comm;
-  MC_process_read_simple(&mc_model_checker->process(),
-    &comm, comm_addr, sizeof(comm));
+  mc_model_checker->process().read_bytes(
+    &comm, sizeof(comm), (std::uint64_t)comm_addr);
 
   smx_process_t src_proc = MC_smx_resolve_process(comm.comm.src_proc);
   smx_process_t dst_proc = MC_smx_resolve_process(comm.comm.dst_proc);
@@ -102,12 +102,13 @@ static void update_comm_pattern(mc_comm_pattern_t comm_pattern, smx_synchro_t co
   comm_pattern->dst_host = MC_smx_process_get_host_name(dst_proc);
   if (comm_pattern->data_size == -1 && comm.comm.src_buff != NULL) {
     size_t buff_size;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &buff_size, comm.comm.dst_buff_size, sizeof(buff_size));
+    mc_model_checker->process().read_bytes(
+      &buff_size, sizeof(buff_size), (std::uint64_t)comm.comm.dst_buff_size);
     comm_pattern->data_size = buff_size;
     comm_pattern->data = xbt_malloc0(comm_pattern->data_size);
-    MC_process_read_simple(&mc_model_checker->process(),
-      comm_pattern->data, comm.comm.src_buff, comm_pattern->data_size);
+    mc_model_checker->process().read_bytes(
+      comm_pattern->data, comm_pattern->data_size,
+      (std::uint64_t) comm.comm.src_buff);
   }
 }
 
@@ -184,30 +185,26 @@ void MC_get_comm_pattern(xbt_dynar_t list, smx_simcall_t request, e_mc_call_type
     pattern->type = SIMIX_COMM_SEND;
     pattern->comm_addr = simcall_comm_isend__get__result(request);
 
-    s_smx_synchro_t synchro;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &synchro, pattern->comm_addr, sizeof(synchro));
+    s_smx_synchro_t synchro = mc_model_checker->process().read<s_smx_synchro_t>(
+      (std::uint64_t) pattern->comm_addr);
 
-    char* remote_name;
-    MC_process_read_simple(&mc_model_checker->process(), &remote_name,
-      synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name,
-      sizeof(remote_name));
+    char* remote_name = mc_model_checker->process().read<char*>(
+      (std::uint64_t)(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
     pattern->rdv =
       MC_process_read_string(&mc_model_checker->process(), remote_name);
     pattern->src_proc = MC_smx_resolve_process(synchro.comm.src_proc)->pid;
     pattern->src_host = MC_smx_process_get_host_name(issuer);
 
-    struct s_smpi_mpi_request mpi_request;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &mpi_request, (MPI_Request) simcall_comm_isend__get__data(request),
-      sizeof(mpi_request));
+    struct s_smpi_mpi_request mpi_request =
+      mc_model_checker->process().read<s_smpi_mpi_request>(
+        (std::uint64_t) simcall_comm_isend__get__data(request));
     pattern->tag = mpi_request.tag;
 
     if(synchro.comm.src_buff != NULL){
       pattern->data_size = synchro.comm.src_buff_size;
       pattern->data = xbt_malloc0(pattern->data_size);
-      MC_process_read_simple(&mc_model_checker->process(),
-        pattern->data, synchro.comm.src_buff, pattern->data_size);
+      mc_model_checker->process().read_bytes(
+        pattern->data, pattern->data_size, (std::uint64_t)synchro.comm.src_buff);
     }
     if(mpi_request.detached){
       if (!initial_global_state->initial_communications_pattern_done) {
@@ -231,19 +228,19 @@ void MC_get_comm_pattern(xbt_dynar_t list, smx_simcall_t request, e_mc_call_type
     pattern->comm_addr = simcall_comm_irecv__get__result(request);
 
     struct s_smpi_mpi_request mpi_request;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &mpi_request, (MPI_Request) simcall_comm_irecv__get__data(request),
-      sizeof(mpi_request));
+    mc_model_checker->process().read_bytes(
+      &mpi_request, sizeof(mpi_request),
+      (std::uint64_t) simcall_comm_irecv__get__data(request));
     pattern->tag = mpi_request.tag;
 
     s_smx_synchro_t synchro;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &synchro, pattern->comm_addr, sizeof(synchro));
+    mc_model_checker->process().read_bytes(
+      &synchro, sizeof(synchro), (std::uint64_t)pattern->comm_addr);
 
     char* remote_name;
-    MC_process_read_simple(&mc_model_checker->process(), &remote_name,
-      synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name,
-      sizeof(remote_name));
+    mc_model_checker->process().read_bytes(
+      &remote_name, sizeof(remote_name),
+      (std::uint64_t)(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
     pattern->rdv =
       MC_process_read_string(&mc_model_checker->process(), remote_name);
     pattern->dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc)->pid;