#include <string.h>
#include <link.h>
+#include <dirent.h>
#include "internal_config.h"
#include "mc_private.h"
/******************************* Snapshot regions ********************************/
/*********************************************************************************/
- static mc_mem_region_t mc_region_new_dense(int type, void *start_addr, void* permanent_addr, size_t size, mc_mem_region_t ref_reg)
+static mc_mem_region_t mc_region_new_dense(int type, void *start_addr, void* permanent_addr, size_t size, mc_mem_region_t ref_reg)
{
mc_mem_region_t new_reg = xbt_new(s_mc_mem_region_t, 1);
new_reg->start_addr = start_addr;
}
-/** \brief Fill/lookup the "subtype" field.
- */
-static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type)
-{
-
- if (type->dw_type_id == NULL)
- return;
- type->subtype = xbt_dict_get_or_null(info->types, type->dw_type_id);
- if (type->subtype == NULL)
- return;
- if (type->subtype->byte_size != 0)
- return;
- if (type->subtype->name == NULL)
- return;
- // Try to find a more complete description of the type:
- // We need to fix in order to support C++.
-
- dw_type_t subtype =
- xbt_dict_get_or_null(info->full_types_by_name, type->subtype->name);
- if (subtype != NULL) {
- type->subtype = subtype;
- }
-
-}
-
-void MC_post_process_types(mc_object_info_t info)
-{
- xbt_dict_cursor_t cursor = NULL;
- char *origin;
- dw_type_t type;
-
- // Lookup "subtype" field:
- xbt_dict_foreach(info->types, cursor, origin, type) {
- MC_resolve_subtype(info, type);
-
- dw_type_t member;
- unsigned int i = 0;
- if (type->members != NULL)
- xbt_dynar_foreach(type->members, i, member) {
- MC_resolve_subtype(info, member);
- }
- }
-}
-
/** \brief Fills the position of the segments (executable, read-only, read/write).
*
* TODO, use dl_iterate_phdr to be more robust
int mc_important_snapshot(mc_snapshot_t snapshot)
{
// We need this snapshot in order to know which
- // pages needs to be stored in the next snapshot:
+ // pages needs to be stored in the next snapshot.
+ // This field is only non-NULL when using soft-dirty
+ // page tracking.
if (snapshot == mc_model_checker->parent_snapshot)
return true;
return false;
}
+static void MC_get_current_fd(mc_snapshot_t snapshot){
+
+ struct dirent *fd_number;
+ DIR *fd_dir;
+ char *command;
+ size_t n;
+ char *line = NULL;
+ FILE *fp;
+ int fd_value;
+
+ snapshot->total_fd = 0;
+
+ fd_dir = opendir ("/proc/self/fd");
+ if (fd_dir == NULL) {
+ printf ("Cannot open directory '/proc/self/fd'\n");
+ return;
+ }
+
+ while ((fd_number = readdir(fd_dir)) != NULL) {
+
+ fd_value = atoi(fd_number->d_name);
+
+ if(fd_value < 3)
+ continue;
+
+ command = bprintf("readlink /proc/self/fd/%s", fd_number->d_name);
+ fp = popen(command, "r");
+ if(fp == NULL){
+ perror("popen failed");
+ xbt_abort();
+ }
+ xbt_getline(&line, &n, fp);
+ if(line && strncmp(line, "pipe:", 5) != 0 && strncmp(line, "socket:", 7) != 0){
+ fd_infos_t fd = xbt_new0(s_fd_infos_t, 1);
+ fd->filename = strdup(line);
+ fd->filename[strlen(line)-1] = '\0';
+ fd->number = fd_value;
+ fd->flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
+ fd->current_position = lseek(fd_value, 0, SEEK_CUR);
+ snapshot->current_fd = xbt_realloc(snapshot->current_fd, (snapshot->total_fd + 1) * sizeof(fd_infos_t));
+ snapshot->current_fd[snapshot->total_fd] = fd;
+ snapshot->total_fd++;
+ }
+
+ xbt_free(command);
+ pclose(fp);
+ }
+
+ xbt_free(line);
+ closedir (fd_dir);
+
+}
+
mc_snapshot_t MC_take_snapshot(int num_state)
{
MC_snapshot_handle_ignore(snapshot);
+ MC_get_current_fd(snapshot);
+
/* Save the std heap and the writable mapped pages of libsimgrid and binary */
MC_get_memory_regions(snapshot);
if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) {
{
mc_snapshot_t parent_snapshot = mc_model_checker->parent_snapshot;
+ int new_fd;
unsigned int i;
for (i = 0; i < NB_REGIONS; i++) {
// For privatized, variables we decided it was not necessary to take the snapshot:
}
#endif
+ for(i=0; i < snapshot->total_fd; i++){
+
+ new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags);
+ if(new_fd != -1 && new_fd != snapshot->current_fd[i]->number){
+ dup2(new_fd, snapshot->current_fd[i]->number);
+ //fprintf(stderr, "%p\n", fdopen(snapshot->current_fd[i]->number, "rw"));
+ close(new_fd);
+ };
+ lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET);
+ }
+
if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) {
mc_softdirty_reset();
}
if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) {
mc_model_checker->parent_snapshot = snapshot;
}
+
}
-mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall)
+mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
{
return MC_take_snapshot(1);
}