X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d13b1659a0c2551ee41b287a269e391bb2d7bc8a..e1459ae1f3ca27cf74f3592980445151049defd1:/src/mc/mc_unw.cpp diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp index a141f09739..1a6fa90982 100644 --- a/src/mc/mc_unw.cpp +++ b/src/mc/mc_unw.cpp @@ -18,11 +18,14 @@ #include -#include "mc_object_info.h" -#include "mc_process.h" -#include "mc_unw.h" +#include "src/mc/Process.hpp" +#include "src/mc/mc_unw.h" +#include "src/mc/Frame.hpp" -extern "C" { +using simgrid::mc::remote; + +namespace simgrid { +namespace mc { // ***** Implementation @@ -30,14 +33,14 @@ extern "C" { * * Delegates to the local/ptrace implementation. */ -static int find_proc_info(unw_addr_space_t as, +int UnwindContext::find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pip, - int need_unwind_info, void* arg) + int need_unwind_info, void* arg) noexcept { - mc_unw_context_t context = (mc_unw_context_t) arg; - return unw_get_accessors(context->process->unw_underlying_addr_space)->find_proc_info( - context->process->unw_underlying_addr_space, ip, pip, - need_unwind_info, context->process->unw_underlying_context + simgrid::mc::UnwindContext* context = (simgrid::mc::UnwindContext*) arg; + return unw_get_accessors(context->process_->unw_underlying_addr_space)->find_proc_info( + context->process_->unw_underlying_addr_space, ip, pip, + need_unwind_info, context->process_->unw_underlying_context ); } @@ -45,13 +48,13 @@ static int find_proc_info(unw_addr_space_t as, * * Delegates to the local/ptrace implementation. */ -static void put_unwind_info(unw_addr_space_t as, - unw_proc_info_t *pip, void* arg) +void UnwindContext::put_unwind_info(unw_addr_space_t as, + unw_proc_info_t *pip, void* arg) noexcept { - mc_unw_context_t context = (mc_unw_context_t) arg; - return unw_get_accessors(context->process->unw_underlying_addr_space)->put_unwind_info( - context->process->unw_underlying_addr_space, pip, - context->process->unw_underlying_context + simgrid::mc::UnwindContext* context = (simgrid::mc::UnwindContext*) arg; + return unw_get_accessors(context->process_->unw_underlying_addr_space)->put_unwind_info( + context->process_->unw_underlying_addr_space, pip, + context->process_->unw_underlying_context ); } @@ -59,35 +62,33 @@ static void put_unwind_info(unw_addr_space_t as, * * Not implemented. */ -static int get_dyn_info_list_addr(unw_addr_space_t as, - unw_word_t *dilap, void* arg) +int UnwindContext::get_dyn_info_list_addr(unw_addr_space_t as, + unw_word_t *dilap, void* arg) noexcept { - mc_unw_context_t context = (mc_unw_context_t) arg; - return unw_get_accessors(context->process->unw_underlying_addr_space)->get_dyn_info_list_addr( - context->process->unw_underlying_addr_space, + simgrid::mc::UnwindContext* context = (simgrid::mc::UnwindContext*) arg; + return unw_get_accessors(context->process_->unw_underlying_addr_space)->get_dyn_info_list_addr( + context->process_->unw_underlying_addr_space, dilap, - context->process->unw_underlying_context + context->process_->unw_underlying_context ); } /** Read from the target address space memory (libunwind method) * - * Delegates to the `mc_process_t`. + * Delegates to the `simgrid::mc::Process*`. */ -static int access_mem(unw_addr_space_t as, +int UnwindContext::access_mem(unw_addr_space_t as, unw_word_t addr, unw_word_t *valp, - int write, void* arg) + int write, void* arg) noexcept { - mc_unw_context_t context = (mc_unw_context_t) arg; + simgrid::mc::UnwindContext* context = (simgrid::mc::UnwindContext*) arg; if (write) return - UNW_EREADONLYREG; - MC_address_space_read(context->address_space, - MC_ADDRESS_SPACE_READ_FLAGS_NONE, valp, (void*) addr, sizeof(unw_word_t), MC_PROCESS_INDEX_ANY); - // We don't handle failure gracefully. + context->addressSpace_->read_bytes(valp, sizeof(unw_word_t), remote(addr)); return 0; } -static void* get_reg(unw_context_t* context, unw_regnum_t regnum) +void* UnwindContext::get_reg(unw_context_t* context, unw_regnum_t regnum) noexcept { #ifdef __x86_64 mcontext_t* mcontext = &context->uc_mcontext; @@ -109,21 +110,21 @@ static void* get_reg(unw_context_t* context, unw_regnum_t regnum) case UNW_X86_64_R14: return &mcontext->gregs[REG_R14]; case UNW_X86_64_R15: return &mcontext->gregs[REG_R15]; case UNW_X86_64_RIP: return &mcontext->gregs[REG_RIP]; - default: return NULL; + default: return nullptr; } #else - return NULL; + return nullptr; #endif } /** Read a standard register (libunwind method) */ -static int access_reg(unw_addr_space_t as, +int UnwindContext::access_reg(unw_addr_space_t as, unw_regnum_t regnum, unw_word_t *valp, - int write, void* arg) + int write, void* arg) noexcept { - mc_unw_context_t as_context = (mc_unw_context_t) arg; - unw_context_t* context = &as_context->context; + simgrid::mc::UnwindContext* as_context = (simgrid::mc::UnwindContext*) arg; + unw_context_t* context = &as_context->unwindContext_; if (write) return -UNW_EREADONLYREG; greg_t* preg = (greg_t*) get_reg(context, regnum); @@ -139,9 +140,9 @@ static int access_reg(unw_addr_space_t as, * `getcontext()` is not relevant for the caller. It is not really necessary * to save and handle them. */ -static int access_fpreg(unw_addr_space_t as, +int UnwindContext::access_fpreg(unw_addr_space_t as, unw_regnum_t regnum, unw_fpreg_t *fpvalp, - int write, void* arg) + int write, void* arg) noexcept { return -UNW_EBADREG; } @@ -150,26 +151,26 @@ static int access_fpreg(unw_addr_space_t as, * * We don't use this. */ -static int resume(unw_addr_space_t as, - unw_cursor_t *cp, void* arg) +int UnwindContext::resume(unw_addr_space_t as, + unw_cursor_t *cp, void* arg) noexcept { return -UNW_EUNSPEC; } /** Find informations about a function (libunwind method) */ -static int get_proc_name(unw_addr_space_t as, +int UnwindContext::get_proc_name(unw_addr_space_t as, unw_word_t addr, char *bufp, size_t buf_len, unw_word_t *offp, - void* arg) + void* arg) noexcept { - mc_unw_context_t context = (mc_unw_context_t) arg; - dw_frame_t frame = MC_process_find_function(context->process, (void*) addr); + simgrid::mc::UnwindContext* context = (simgrid::mc::UnwindContext*) arg; + simgrid::mc::Frame* frame = context->process_->find_function(remote(addr)); if (!frame) return - UNW_ENOINFO; - *offp = (unw_word_t) frame->low_pc - addr; + *offp = (unw_word_t) frame->range.begin() - addr; - strncpy(bufp, frame->name, buf_len); + strncpy(bufp, frame->name.c_str(), buf_len); if (bufp[buf_len - 1]) { bufp[buf_len - 1] = 0; return -UNW_ENOMEM; @@ -180,63 +181,69 @@ static int get_proc_name(unw_addr_space_t as, // ***** Init -unw_accessors_t mc_unw_accessors = - { - .find_proc_info = &find_proc_info, - .put_unwind_info = &put_unwind_info, - .get_dyn_info_list_addr = &get_dyn_info_list_addr, - .access_mem = &access_mem, - .access_reg = &access_reg, - .access_fpreg = &access_fpreg, - .resume = &resume, - .get_proc_name = &get_proc_name - }; - -// ***** Context management - -int mc_unw_init_context( - mc_unw_context_t context, mc_process_t process, unw_context_t* c) +/** Virtual table for our `libunwind` implementation + * + * Stack unwinding on a `simgrid::mc::Process*` (for memory, unwinding information) + * and `ucontext_t` (for processor registers). + * + * It works with the `simgrid::mc::UnwindContext` context. + */ +unw_accessors_t UnwindContext::accessors = { + &find_proc_info, + &put_unwind_info, + &get_dyn_info_list_addr, + &access_mem, + &access_reg, + &access_fpreg, + &resume, + &get_proc_name +}; + +unw_addr_space_t UnwindContext::createUnwindAddressSpace() +{ + return unw_create_addr_space(&UnwindContext::accessors, __BYTE_ORDER); +} + +void UnwindContext::clear() +{ + addressSpace_ = nullptr; + process_ = nullptr; +} + +void UnwindContext::initialize(simgrid::mc::Process* process, unw_context_t* c) { - context->address_space = (mc_address_space_t) process; - context->process = process; + clear(); + + this->addressSpace_ = process; + this->process_ = process; // Take a copy of the context for our own purpose: - context->context = *c; -#if defined(PROCESSOR_x86_64) || defined(PROCESSOR_i686) + this->unwindContext_ = *c; +#if SIMGRID_PROCESSOR_x86_64 || SIMGRID_PROCESSOR_i686 // On x86_64, ucontext_t contains a pointer to itself for FP registers. // We don't really need support for FR registers as they are caller saved // and probably never use those fields as libunwind-x86_64 does not read // FP registers from the unw_context_t // but we fix the pointer in order to avoid dangling pointers: - context->context.uc_mcontext.fpregs = &(context->context.__fpregs_mem); + // context->context_.uc_mcontext.fpregs = &(context->context.__fpregs_mem); + + // Let's ignore this and see what happens: + this->unwindContext_.uc_mcontext.fpregs = nullptr; #else // Do we need to do any fixup like this? #error Target CPU type is not handled. #endif - - return 0; } -int mc_unw_destroy_context(mc_unw_context_t context) +unw_cursor_t UnwindContext::cursor() { - context->address_space = NULL; - context->process = NULL; - return 0; + unw_cursor_t cursor; + if (process_ == nullptr + || addressSpace_ == nullptr + || unw_init_remote(&cursor, process_->unw_addr_space, this) != 0) + xbt_die("UnwindContext not initialized"); + return cursor; } -// ***** Cursor management - -int mc_unw_init_cursor(unw_cursor_t *cursor, mc_unw_context_t context) -{ - if (!context->process || !context->address_space) - return -UNW_EUNSPEC; - mc_address_space_t as = context->address_space; - - // Use local unwinding for current process: - if (MC_is_process(as) && MC_process_is_self((mc_process_t) as)) - return unw_init_local(cursor, &context->context); - - return unw_init_remote(cursor, context->process->unw_addr_space, context); } - }