#include "mc_snapshot.h"
#include "mc_ignore.h"
#include "mc_smx.h"
+#include "mc_server.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc,
"MC process information");
void MC_process_refresh_malloc_info(mc_process_t process)
{
assert(!MC_process_is_self(process));
- if (!process->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP)
+ if (!(process->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
MC_process_refresh_heap(process);
// Refresh process->heapinfo:
- size_t malloc_info_bytesize = process->heap->heaplimit * sizeof(malloc_info);
+ size_t malloc_info_bytesize =
+ (process->heap->heaplimit + 1) * sizeof(malloc_info);
xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
- process->heap_info = (malloc_info*) realloc(process->heap_info,
- malloc_info_bytesize);
+ process->heap_info = realloc(process->heap_info, malloc_info_bytesize);
mmalloc_set_current_heap(heap);
MC_process_read(process, MC_ADDRESS_SPACE_READ_FLAGS_NONE,
MC_PROCESS_INDEX_ANY);
}
+char* MC_process_read_string(mc_process_t process, void* address)
+{
+ if (!address)
+ return NULL;
+ if (MC_process_is_self(process))
+ return strdup((char*) address);
+
+ size_t len = 128;
+ char* res = malloc(len);
+ off_t off = 0;
+
+ while (1) {
+ ssize_t c = pread(process->memory_file, res + off, len - off, (off_t) address + off);
+ if (c == -1) {
+ if (errno == EINTR)
+ continue;
+ else
+ xbt_die("Could not read from from remote process");
+ }
+ if (c==0)
+ xbt_die("Could not read string from remote process");
+
+ void* p = memchr(res + off, '\0', c);
+ if (p)
+ return res;
+
+ off += c;
+ if (off == len) {
+ len *= 2;
+ res = realloc(res, len);
+ }
+ }
+}
+
// ***** Memory access
int MC_process_vm_open(pid_t pid, int flags)
}
const void* MC_process_read_dynar_element(mc_process_t process,
- void* local, const void* remote_dynar, size_t i)
+ void* local, const void* remote_dynar, size_t i, size_t len)
{
s_xbt_dynar_t d;
MC_process_read_simple(process, &d, remote_dynar, sizeof(d));
- MC_process_read_simple(process, local, xbt_dynar_get_ptr(&d, i), i);
+ if (i >= d.used)
+ xbt_die("Out of bound index %zi/%zi", i, d.used);
+ if (len != d.elmsize)
+ xbt_die("Bad size in MC_process_read_dynar_element");
+ MC_process_read_simple(process, local, xbt_dynar_get_ptr(&d, i), len);
return local;
}
return;
}
- MC_process_smx_refresh(&mc_model_checker->process);
-
unsigned i;
mc_smx_process_info_t pi = NULL;
xbt_dynar_foreach_ptr(mc_model_checker->process.smx_process_infos, i, pi) {
- smx_process_t p = (smx_process_t) pi->address;
if (req == &pi->copy.simcall) {
- smx_simcall_t real_req = &p->simcall;
- // TODO, use a remote call
- SIMIX_simcall_handle(real_req, value);
+ MC_server_simcall_handle(&mc_model_checker->process, pi->copy.pid, value);
return;
}
}
- // Check (remove afterwards):
- xbt_dynar_foreach_ptr(mc_model_checker->process.smx_process_infos, i, pi) {
- smx_process_t p = (smx_process_t) pi->address;
- if (req == &p->simcall)
- xbt_die("The real simcall was passed. We expected the local copy.");
- }
-
xbt_die("Could not find the request");
}