X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a69dbf9a2522d0ccde10350b49c5866ed9d731bd..717c4b31876300acbf14a58196b5b57538d8ce46:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 6920bf2b97..38f64893db 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -7,11 +7,14 @@ #define _GNU_SOURCE #define UNW_LOCAL_ONLY +#include #include #include +#include #include "internal_config.h" +#include "mc_memory_map.h" #include "mc_private.h" #include "xbt/module.h" #include @@ -22,12 +25,15 @@ #include "../simix/smx_private.h" +#define UNW_LOCAL_ONLY #include #include #include "mc_private.h" #include +#include "mc_snapshot.h" +#include "mc_object_info.h" #include "mc_mmu.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, @@ -574,6 +580,81 @@ int mc_important_snapshot(mc_snapshot_t snapshot) return false; } +static void MC_get_current_fd(mc_snapshot_t snapshot){ + + snapshot->total_fd = 0; + + const size_t fd_dir_path_size = 20; + char fd_dir_path[fd_dir_path_size]; + if (snprintf(fd_dir_path, fd_dir_path_size, + "/proc/%lli/fd", (long long int) getpid()) > fd_dir_path_size) + xbt_die("Unexpected buffer is too small for fd_dir_path"); + + DIR* fd_dir = opendir (fd_dir_path); + if (fd_dir == NULL) + xbt_die("Cannot open directory '/proc/self/fd'\n"); + + size_t total_fd = 0; + struct dirent* fd_number; + while ((fd_number = readdir(fd_dir))) { + + int fd_value = atoi(fd_number->d_name); + + if(fd_value < 3) + continue; + + const size_t source_size = 25; + char source[25]; + if (snprintf(source, source_size, "/proc/self/fd/%s", fd_number->d_name) > source_size) + xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name); + + const size_t link_size = 200; + char link[200]; + int res = readlink(source, link, link_size); + if (res<0) { + xbt_die("Could not read link for %s", source); + } + if (res==200) { + xbt_die("Buffer to small for link of %s", source); + } + link[res] = '\0'; + + if(smpi_is_privatisation_file(link)) + continue; + + // This is (probably) the DIR* we are reading: + // TODO, read all the file entries at once and close the DIR.* + if(strcmp(fd_dir_path, link) == 0) + continue; + + // We don't handle them. + // It does not mean we should silently ignore them however. + if (strncmp(link, "pipe:", 5) == 0 || strncmp(link, "socket:", 7) == 0) + continue; + + // If dot_output enabled, do not handle the corresponding file + if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0) + continue; + + // This is probably a shared memory used by lttng-ust: + if(strncmp("/dev/shm/ust-shm-tmp-", link, 21)==0) + continue; + + // Add an entry for this FD in the snapshot: + fd_infos_t fd = xbt_new0(s_fd_infos_t, 1); + fd->filename = strdup(link); + 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, (total_fd + 1) * sizeof(fd_infos_t)); + snapshot->current_fd[total_fd] = fd; + total_fd++; + } + + snapshot->total_fd = total_fd; + closedir (fd_dir); +} + mc_snapshot_t MC_take_snapshot(int num_state) { @@ -586,6 +667,8 @@ 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) { @@ -617,6 +700,7 @@ void MC_restore_snapshot(mc_snapshot_t snapshot) { 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: @@ -647,6 +731,21 @@ void MC_restore_snapshot(mc_snapshot_t 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 <0) { + xbt_die("Could not reopen the file %s fo restoring the file descriptor", + snapshot->current_fd[i]->filename); + } + 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(); } @@ -655,6 +754,7 @@ void MC_restore_snapshot(mc_snapshot_t snapshot) if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) { mc_model_checker->parent_snapshot = snapshot; } + } mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)