9a3c826307
Note: I needed to split this patch in two, otherwise it's too big for the mailing list. This patch adds explicit casts to situations where a void pointer is assigned to a pointer to the "real" type. Building in C++ mode requires those assignments to use an explicit cast. This includes, for example: - callback arguments (cleanups, comparison functions, ...) - data attached to some object (objfile, program space, etc) in the form of a void pointer - "user data" passed to some function This patch comes from the commit "(mostly) auto-generated patch to insert casts needed for C++", taken from Pedro's C++ branch. Only files built on x86 with --enable-targets=all are modified, so the native files for other arches will need to be dealt with separately. I built-tested this with --enable-targets=all and reg-tested. To my surprise, a test case (selftest.exp) had to be adjusted. Here's the ChangeLog entry. Again, this was relatively quick to make despite the length, thanks to David Malcom's script, although I don't believe it's very useful information in that particular case... gdb/ChangeLog: * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. * ada-lang.c (ada_inferior_data_cleanup): Likewise. (get_ada_inferior_data): Likewise. (get_ada_pspace_data): Likewise. (ada_pspace_data_cleanup): Likewise. (ada_complete_symbol_matcher): Likewise. (ada_exc_search_name_matches): Likewise. * ada-tasks.c (get_ada_tasks_pspace_data): Likewise. (get_ada_tasks_inferior_data): Likewise. * addrmap.c (addrmap_mutable_foreach_worker): Likewise. (splay_obstack_alloc): Likewise. (splay_obstack_free): Likewise. * alpha-linux-tdep.c (alpha_linux_supply_gregset): Likewise. (alpha_linux_collect_gregset): Likewise. (alpha_linux_supply_fpregset): Likewise. (alpha_linux_collect_fpregset): Likewise. * alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise. * alpha-tdep.c (alpha_lds): Likewise. (alpha_sts): Likewise. (alpha_sigtramp_frame_unwind_cache): Likewise. (alpha_heuristic_frame_unwind_cache): Likewise. (alpha_supply_int_regs): Likewise. (alpha_fill_int_regs): Likewise. (alpha_supply_fp_regs): Likewise. (alpha_fill_fp_regs): Likewise. * alphanbsd-tdep.c (alphanbsd_supply_fpregset): Likewise. (alphanbsd_aout_supply_gregset): Likewise. (alphanbsd_supply_gregset): Likewise. * amd64-linux-tdep.c (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-nat.c (amd64_supply_native_gregset): Likewise. (amd64_collect_native_gregset): Likewise. * amd64-tdep.c (amd64_frame_cache): Likewise. (amd64_sigtramp_frame_cache): Likewise. (amd64_epilogue_frame_cache): Likewise. (amd64_supply_fxsave): Likewise. (amd64_supply_xsave): Likewise. (amd64_collect_fxsave): Likewise. (amd64_collect_xsave): Likewise. * amd64-windows-tdep.c (amd64_windows_frame_cache): Likewise. * amd64obsd-tdep.c (amd64obsd_trapframe_cache): Likewise. * arm-linux-tdep.c (arm_linux_supply_gregset): Likewise. (arm_linux_collect_gregset): Likewise. (arm_linux_supply_nwfpe): Likewise. (arm_linux_collect_nwfpe): Likewise. (arm_linux_supply_vfp): Likewise. (arm_linux_collect_vfp): Likewise. * arm-tdep.c (arm_find_mapping_symbol): Likewise. (arm_prologue_unwind_stop_reason): Likewise. (arm_prologue_this_id): Likewise. (arm_prologue_prev_register): Likewise. (arm_exidx_data_free): Likewise. (arm_find_exidx_entry): Likewise. (arm_stub_this_id): Likewise. (arm_m_exception_this_id): Likewise. (arm_m_exception_prev_register): Likewise. (arm_normal_frame_base): Likewise. (gdb_print_insn_arm): Likewise. (arm_objfile_data_free): Likewise. (arm_record_special_symbol): Likewise. (value_of_arm_user_reg): Likewise. * armbsd-tdep.c (armbsd_supply_fpregset): Likewise. (armbsd_supply_gregset): Likewise. * auto-load.c (auto_load_pspace_data_cleanup): Likewise. (get_auto_load_pspace_data): Likewise. (hash_loaded_script_entry): Likewise. (eq_loaded_script_entry): Likewise. (clear_section_scripts): Likewise. (collect_matching_scripts): Likewise. * auxv.c (auxv_inferior_data_cleanup): Likewise. (get_auxv_inferior_data): Likewise. * avr-tdep.c (avr_frame_unwind_cache): Likewise. * ax-general.c (do_free_agent_expr_cleanup): Likewise. * bfd-target.c (target_bfd_xfer_partial): Likewise. (target_bfd_xclose): Likewise. (target_bfd_get_section_table): Likewise. * bfin-tdep.c (bfin_frame_cache): Likewise. * block.c (find_block_in_blockvector): Likewise. (call_site_for_pc): Likewise. (block_find_non_opaque_type_preferred): Likewise. * break-catch-sig.c (signal_catchpoint_insert_location): Likewise. (signal_catchpoint_remove_location): Likewise. (signal_catchpoint_breakpoint_hit): Likewise. (signal_catchpoint_print_one): Likewise. (signal_catchpoint_print_mention): Likewise. (signal_catchpoint_print_recreate): Likewise. * break-catch-syscall.c (get_catch_syscall_inferior_data): Likewise. * breakpoint.c (do_cleanup_counted_command_line): Likewise. (bp_location_compare_addrs): Likewise. (get_first_locp_gte_addr): Likewise. (check_tracepoint_command): Likewise. (do_map_commands_command): Likewise. (get_breakpoint_objfile_data): Likewise. (free_breakpoint_probes): Likewise. (do_captured_breakpoint_query): Likewise. (compare_breakpoints): Likewise. (bp_location_compare): Likewise. (bpstat_remove_breakpoint_callback): Likewise. (do_delete_breakpoint_cleanup): Likewise. * bsd-uthread.c (bsd_uthread_set_supply_uthread): Likewise. (bsd_uthread_set_collect_uthread): Likewise. (bsd_uthread_activate): Likewise. (bsd_uthread_fetch_registers): Likewise. (bsd_uthread_store_registers): Likewise. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt_raw): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. (do_btrace_data_cleanup): Likewise. * c-typeprint.c (find_typedef_for_canonicalize): Likewise. * charset.c (cleanup_iconv): Likewise. (do_cleanup_iterator): Likewise. * cli-out.c (cli_uiout_dtor): Likewise. (cli_table_begin): Likewise. (cli_table_body): Likewise. (cli_table_end): Likewise. (cli_table_header): Likewise. (cli_begin): Likewise. (cli_end): Likewise. (cli_field_int): Likewise. (cli_field_skip): Likewise. (cli_field_string): Likewise. (cli_field_fmt): Likewise. (cli_spaces): Likewise. (cli_text): Likewise. (cli_message): Likewise. (cli_wrap_hint): Likewise. (cli_flush): Likewise. (cli_redirect): Likewise. (out_field_fmt): Likewise. (field_separator): Likewise. (cli_out_set_stream): Likewise. * cli/cli-cmds.c (compare_symtabs): Likewise. * cli/cli-dump.c (call_dump_func): Likewise. (restore_section_callback): Likewise. * cli/cli-script.c (clear_hook_in_cleanup): Likewise. (do_restore_user_call_depth): Likewise. (do_free_command_lines_cleanup): Likewise. * coff-pe-read.c (get_section_vmas): Likewise. (pe_as16): Likewise. (pe_as32): Likewise. * coffread.c (coff_symfile_read): Likewise. * common/agent.c (agent_look_up_symbols): Likewise. * common/filestuff.c (do_close_cleanup): Likewise. * common/format.c (free_format_pieces_cleanup): Likewise. * common/vec.c (vec_o_reserve): Likewise. * compile/compile-c-support.c (print_one_macro): Likewise. * compile/compile-c-symbols.c (hash_symbol_error): Likewise. (eq_symbol_error): Likewise. (del_symbol_error): Likewise. (error_symbol_once): Likewise. (gcc_convert_symbol): Likewise. (gcc_symbol_address): Likewise. (hash_symname): Likewise. (eq_symname): Likewise. * compile/compile-c-types.c (hash_type_map_instance): Likewise. (eq_type_map_instance): Likewise. (insert_type): Likewise. (convert_type): Likewise. * compile/compile-object-load.c (munmap_listp_free_cleanup): Likewise. (setup_sections): Likewise. (link_hash_table_free): Likewise. (copy_sections): Likewise. * compile/compile-object-run.c (do_module_cleanup): Likewise. * compile/compile.c (compile_print_value): Likewise. (do_rmdir): Likewise. (cleanup_compile_instance): Likewise. (cleanup_unlink_file): Likewise. * completer.c (free_completion_tracker): Likewise. * corelow.c (add_to_spuid_list): Likewise. * cp-namespace.c (reset_directive_searched): Likewise. * cp-support.c (reset_directive_searched): Likewise. * cris-tdep.c (cris_sigtramp_frame_unwind_cache): Likewise. (cris_frame_unwind_cache): Likewise. * d-lang.c (builtin_d_type): Likewise. * d-namespace.c (reset_directive_searched): Likewise. * dbxread.c (dbx_free_symfile_info): Likewise. (do_free_bincl_list_cleanup): Likewise. * disasm.c (hash_dis_line_entry): Likewise. (eq_dis_line_entry): Likewise. (dis_asm_print_address): Likewise. (fprintf_disasm): Likewise. (do_ui_file_delete): Likewise. * doublest.c (convert_floatformat_to_doublest): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Likewise. (dummy_frame_prev_register): Likewise. (dummy_frame_this_id): Likewise. * dwarf2-frame-tailcall.c (cache_hash): Likewise. (cache_eq): Likewise. (cache_find): Likewise. (tailcall_frame_this_id): Likewise. (dwarf2_tailcall_prev_register_first): Likewise. (tailcall_frame_prev_register): Likewise. (tailcall_frame_dealloc_cache): Likewise. (tailcall_frame_prev_arch): Likewise. * dwarf2-frame.c (dwarf2_frame_state_free): Likewise. (dwarf2_frame_set_init_reg): Likewise. (dwarf2_frame_init_reg): Likewise. (dwarf2_frame_set_signal_frame_p): Likewise. (dwarf2_frame_signal_frame_p): Likewise. (dwarf2_frame_set_adjust_regnum): Likewise. (dwarf2_frame_adjust_regnum): Likewise. (clear_pointer_cleanup): Likewise. (dwarf2_frame_cache): Likewise. (find_cie): Likewise. (dwarf2_frame_find_fde): Likewise. * dwarf2expr.c (dwarf_expr_address_type): Likewise. (free_dwarf_expr_context_cleanup): Likewise. * dwarf2loc.c (locexpr_find_frame_base_location): Likewise. (locexpr_get_frame_base): Likewise. (loclist_find_frame_base_location): Likewise. (loclist_get_frame_base): Likewise. (dwarf_expr_dwarf_call): Likewise. (dwarf_expr_get_base_type): Likewise. (dwarf_expr_push_dwarf_reg_entry_value): Likewise. (dwarf_expr_get_obj_addr): Likewise. (entry_data_value_coerce_ref): Likewise. (entry_data_value_copy_closure): Likewise. (entry_data_value_free_closure): Likewise. (get_frame_address_in_block_wrapper): Likewise. (dwarf2_evaluate_property): Likewise. (dwarf2_compile_property_to_c): Likewise. (needs_frame_read_addr_from_reg): Likewise. (needs_frame_get_reg_value): Likewise. (needs_frame_frame_base): Likewise. (needs_frame_frame_cfa): Likewise. (needs_frame_tls_address): Likewise. (needs_frame_dwarf_call): Likewise. (needs_dwarf_reg_entry_value): Likewise. (get_ax_pc): Likewise. (locexpr_read_variable): Likewise. (locexpr_read_variable_at_entry): Likewise. (locexpr_read_needs_frame): Likewise. (locexpr_describe_location): Likewise. (locexpr_tracepoint_var_ref): Likewise. (locexpr_generate_c_location): Likewise. (loclist_read_variable): Likewise. (loclist_read_variable_at_entry): Likewise. (loclist_describe_location): Likewise. (loclist_tracepoint_var_ref): Likewise. (loclist_generate_c_location): Likewise. * dwarf2read.c (line_header_hash_voidp): Likewise. (line_header_eq_voidp): Likewise. (dwarf2_has_info): Likewise. (dwarf2_get_section_info): Likewise. (locate_dwz_sections): Likewise. (hash_file_name_entry): Likewise. (eq_file_name_entry): Likewise. (delete_file_name_entry): Likewise. (dw2_setup): Likewise. (dw2_get_file_names_reader): Likewise. (dw2_find_pc_sect_compunit_symtab): Likewise. (hash_signatured_type): Likewise. (eq_signatured_type): Likewise. (add_signatured_type_cu_to_table): Likewise. (create_debug_types_hash_table): Likewise. (lookup_dwo_signatured_type): Likewise. (lookup_dwp_signatured_type): Likewise. (lookup_signatured_type): Likewise. (hash_type_unit_group): Likewise. (eq_type_unit_group): Likewise. (get_type_unit_group): Likewise. (process_psymtab_comp_unit_reader): Likewise. (sort_tu_by_abbrev_offset): Likewise. (process_skeletonless_type_unit): Likewise. (psymtabs_addrmap_cleanup): Likewise. (dwarf2_read_symtab): Likewise. (psymtab_to_symtab_1): Likewise. (die_hash): Likewise. (die_eq): Likewise. (load_full_comp_unit_reader): Likewise. (reset_die_in_process): Likewise. (free_cu_line_header): Likewise. (handle_DW_AT_stmt_list): Likewise. (hash_dwo_file): Likewise. (eq_dwo_file): Likewise. (hash_dwo_unit): Likewise. (eq_dwo_unit): Likewise. (create_dwo_cu_reader): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (lookup_dwo_unit_in_dwp): Likewise. (dwarf2_locate_dwo_sections): Likewise. (dwarf2_locate_common_dwp_sections): Likewise. (dwarf2_locate_v2_dwp_sections): Likewise. (hash_dwp_loaded_cutus): Likewise. (eq_dwp_loaded_cutus): Likewise. (lookup_dwo_cutu): Likewise. (abbrev_table_free_cleanup): Likewise. (dwarf2_free_abbrev_table): Likewise. (find_partial_die_in_comp_unit): Likewise. (free_line_header_voidp): Likewise. (follow_die_offset): Likewise. (follow_die_sig_1): Likewise. (free_heap_comp_unit): Likewise. (free_stack_comp_unit): Likewise. (dwarf2_free_objfile): Likewise. (per_cu_offset_and_type_hash): Likewise. (per_cu_offset_and_type_eq): Likewise. (get_die_type_at_offset): Likewise. (partial_die_hash): Likewise. (partial_die_eq): Likewise. (dwarf2_per_objfile_free): Likewise. (hash_strtab_entry): Likewise. (eq_strtab_entry): Likewise. (add_string): Likewise. (hash_symtab_entry): Likewise. (eq_symtab_entry): Likewise. (delete_symtab_entry): Likewise. (cleanup_mapped_symtab): Likewise. (add_indices_to_cpool): Likewise. (hash_psymtab_cu_index): Likewise. (eq_psymtab_cu_index): Likewise. (add_address_entry_worker): Likewise. (unlink_if_set): Likewise. (write_one_signatured_type): Likewise. (save_gdb_index_command): Likewise. * elfread.c (elf_symtab_read): Likewise. (elf_gnu_ifunc_cache_hash): Likewise. (elf_gnu_ifunc_cache_eq): Likewise. (elf_gnu_ifunc_record_cache): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_get_probes): Likewise. (probe_key_free): Likewise. * f-lang.c (builtin_f_type): Likewise. * frame-base.c (frame_base_append_sniffer): Likewise. (frame_base_set_default): Likewise. (frame_base_find_by_frame): Likewise. * frame-unwind.c (frame_unwind_prepend_unwinder): Likewise. (frame_unwind_append_unwinder): Likewise. (frame_unwind_find_by_frame): Likewise. * frame.c (frame_addr_hash): Likewise. (frame_addr_hash_eq): Likewise. (frame_stash_find): Likewise. (do_frame_register_read): Likewise. (unwind_to_current_frame): Likewise. (frame_cleanup_after_sniffer): Likewise. * frv-linux-tdep.c (frv_linux_sigtramp_frame_cache): Likewise. * frv-tdep.c (frv_frame_unwind_cache): Likewise. * ft32-tdep.c (ft32_frame_cache): Likewise. * gcore.c (do_bfd_delete_cleanup): Likewise. (gcore_create_callback): Likewise. * gdb_bfd.c (hash_bfd): Likewise. (eq_bfd): Likewise. (gdb_bfd_open): Likewise. (free_one_bfd_section): Likewise. (gdb_bfd_ref): Likewise. (gdb_bfd_unref): Likewise. (get_section_descriptor): Likewise. (gdb_bfd_map_section): Likewise. (gdb_bfd_crc): Likewise. (gdb_bfd_mark_parent): Likewise. (gdb_bfd_record_inclusion): Likewise. (gdb_bfd_requires_relocations): Likewise. (print_one_bfd): Likewise. * gdbtypes.c (type_pair_hash): Likewise. (type_pair_eq): Likewise. (builtin_type): Likewise. (objfile_type): Likewise. * gnu-v3-abi.c (vtable_ptrdiff_type): Likewise. (vtable_address_point_offset): Likewise. (gnuv3_get_vtable): Likewise. (hash_value_and_voffset): Likewise. (eq_value_and_voffset): Likewise. (compare_value_and_voffset): Likewise. (compute_vtable_size): Likewise. (gnuv3_get_typeid_type): Likewise. * go-lang.c (builtin_go_type): Likewise. * guile/scm-block.c (bkscm_hash_block_smob): Likewise. (bkscm_eq_block_smob): Likewise. (bkscm_objfile_block_map): Likewise. (bkscm_del_objfile_blocks): Likewise. * guile/scm-breakpoint.c (bpscm_build_bp_list): Likewise. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Likewise. (gdbscm_disasm_print_address): Likewise. * guile/scm-frame.c (frscm_hash_frame_smob): Likewise. (frscm_eq_frame_smob): Likewise. (frscm_inferior_frame_map): Likewise. (frscm_del_inferior_frames): Likewise. * guile/scm-gsmob.c (gdbscm_add_objfile_ref): Likewise. * guile/scm-objfile.c (ofscm_handle_objfile_deleted): Likewise. (ofscm_objfile_smob_from_objfile): Likewise. * guile/scm-ports.c (ioscm_write): Likewise. (ioscm_file_port_delete): Likewise. (ioscm_file_port_rewind): Likewise. (ioscm_file_port_put): Likewise. (ioscm_file_port_write): Likewise. * guile/scm-progspace.c (psscm_handle_pspace_deleted): Likewise. (psscm_pspace_smob_from_pspace): Likewise. * guile/scm-safe-call.c (scscm_recording_pre_unwind_handler): Likewise. (scscm_recording_unwind_handler): Likewise. (gdbscm_with_catch): Likewise. (scscm_call_0_body): Likewise. (scscm_call_1_body): Likewise. (scscm_call_2_body): Likewise. (scscm_call_3_body): Likewise. (scscm_call_4_body): Likewise. (scscm_apply_1_body): Likewise. (scscm_eval_scheme_string): Likewise. (gdbscm_safe_eval_string): Likewise. (scscm_source_scheme_script): Likewise. (gdbscm_safe_source_script): Likewise. * guile/scm-string.c (gdbscm_call_scm_to_stringn): Likewise. (gdbscm_call_scm_from_stringn): Likewise. * guile/scm-symbol.c (syscm_hash_symbol_smob): Likewise. (syscm_eq_symbol_smob): Likewise. (syscm_get_symbol_map): Likewise. (syscm_del_objfile_symbols): Likewise. * guile/scm-symtab.c (stscm_hash_symtab_smob): Likewise. (stscm_eq_symtab_smob): Likewise. (stscm_objfile_symtab_map): Likewise. (stscm_del_objfile_symtabs): Likewise. * guile/scm-type.c (tyscm_hash_type_smob): Likewise. (tyscm_eq_type_smob): Likewise. (tyscm_type_map): Likewise. (tyscm_copy_type_recursive): Likewise. (save_objfile_types): Likewise. * guile/scm-utils.c (extract_arg): Likewise. * h8300-tdep.c (h8300_frame_cache): Likewise. * hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Likewise. * hppa-tdep.c (compare_unwind_entries): Likewise. (find_unwind_entry): Likewise. (hppa_frame_cache): Likewise. (hppa_stub_frame_unwind_cache): Likewise. * hppanbsd-tdep.c (hppanbsd_supply_gregset): Likewise. * hppaobsd-tdep.c (hppaobsd_supply_gregset): Likewise. (hppaobsd_supply_fpregset): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. * i386-linux-tdep.c (i386_linux_init_abi): Likewise. * i386-tdep.c (i386_frame_cache): Likewise. (i386_epilogue_frame_cache): Likewise. (i386_sigtramp_frame_cache): Likewise. (i386_supply_gregset): Likewise. (i386_collect_gregset): Likewise. (i386_gdbarch_init): Likewise. * i386obsd-tdep.c (i386obsd_aout_supply_regset): Likewise. (i386obsd_trapframe_cache): Likewise. * i387-tdep.c (i387_supply_fsave): Likewise. (i387_collect_fsave): Likewise. (i387_supply_fxsave): Likewise. (i387_collect_fxsave): Likewise. (i387_supply_xsave): Likewise. (i387_collect_xsave): Likewise. * ia64-tdep.c (ia64_frame_cache): Likewise. (ia64_sigtramp_frame_cache): Likewise. * infcmd.c (attach_command_continuation): Likewise. (attach_command_continuation_free_args): Likewise. * inferior.c (restore_inferior): Likewise. (delete_thread_of_inferior): Likewise. * inflow.c (inflow_inferior_data_cleanup): Likewise. (get_inflow_inferior_data): Likewise. (inflow_inferior_exit): Likewise. * infrun.c (displaced_step_clear_cleanup): Likewise. (restore_current_uiout_cleanup): Likewise. (release_stop_context_cleanup): Likewise. (do_restore_infcall_suspend_state_cleanup): Likewise. (do_restore_infcall_control_state_cleanup): Likewise. (restore_inferior_ptid): Likewise. * inline-frame.c (block_starting_point_at): Likewise. * iq2000-tdep.c (iq2000_frame_cache): Likewise. * jit.c (get_jit_objfile_data): Likewise. (get_jit_program_space_data): Likewise. (jit_object_close_impl): Likewise. (jit_find_objf_with_entry_addr): Likewise. (jit_breakpoint_deleted): Likewise. (jit_unwind_reg_set_impl): Likewise. (jit_unwind_reg_get_impl): Likewise. (jit_dealloc_cache): Likewise. (jit_frame_sniffer): Likewise. (jit_frame_prev_register): Likewise. (jit_prepend_unwinder): Likewise. (jit_inferior_exit_hook): Likewise. (free_objfile_data): Likewise. * jv-lang.c (jv_per_objfile_free): Likewise. (get_dynamics_objfile): Likewise. (get_java_class_symtab): Likewise. (builtin_java_type): Likewise. * language.c (language_string_char_type): Likewise. (language_bool_type): Likewise. (language_lookup_primitive_type): Likewise. (language_lookup_primitive_type_as_symbol): Likewise. * linespec.c (hash_address_entry): Likewise. (eq_address_entry): Likewise. (iterate_inline_only): Likewise. (iterate_name_matcher): Likewise. (decode_line_2_compare_items): Likewise. (collect_one_symbol): Likewise. (compare_symbols): Likewise. (compare_msymbols): Likewise. (add_symtabs_to_list): Likewise. (collect_symbols): Likewise. (compare_msyms): Likewise. (add_minsym): Likewise. (cleanup_linespec_result): Likewise. * linux-fork.c (inferior_call_waitpid_cleanup): Likewise. * linux-nat.c (delete_lwp_cleanup): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (resume_stopped_resumed_lwps): Likewise. * linux-tdep.c (get_linux_gdbarch_data): Likewise. (invalidate_linux_cache_inf): Likewise. (get_linux_inferior_data): Likewise. (linux_find_memory_regions_thunk): Likewise. (linux_make_mappings_callback): Likewise. (linux_corefile_thread_callback): Likewise. (find_mapping_size): Likewise. * linux-thread-db.c (find_new_threads_callback): Likewise. * lm32-tdep.c (lm32_frame_cache): Likewise. * m2-lang.c (builtin_m2_type): Likewise. * m32c-tdep.c (m32c_analyze_frame_prologue): Likewise. * m32r-linux-tdep.c (m32r_linux_sigtramp_frame_cache): Likewise. (m32r_linux_supply_gregset): Likewise. (m32r_linux_collect_gregset): Likewise. * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. * m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise. * m68k-tdep.c (m68k_frame_cache): Likewise. * m68kbsd-tdep.c (m68kbsd_supply_fpregset): Likewise. (m68kbsd_supply_gregset): Likewise. * m68klinux-tdep.c (m68k_linux_sigtramp_frame_cache): Likewise. * m88k-tdep.c (m88k_frame_cache): Likewise. (m88k_supply_gregset): Likewise. gdb/gdbserver/ChangeLog: * dll.c (match_dll): Add cast(s). (unloaded_dll): Likewise. * linux-low.c (second_thread_of_pid_p): Likewise. (delete_lwp_callback): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (linux_set_resume_request): Likewise. * server.c (accumulate_file_name_length): Likewise. (emit_dll_description): Likewise. (handle_qxfer_threads_worker): Likewise. (visit_actioned_threads): Likewise. * thread-db.c (any_thread_of): Likewise. * tracepoint.c (same_process_p): Likewise. (match_blocktype): Likewise. (build_traceframe_info_xml): Likewise. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (do_steps_and_nexts): Adjust expected source line.
791 lines
21 KiB
C
791 lines
21 KiB
C
/* GNU/Linux native-dependent code for debugging multiple forks.
|
|
|
|
Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "arch-utils.h"
|
|
#include "inferior.h"
|
|
#include "infrun.h"
|
|
#include "regcache.h"
|
|
#include "gdbcmd.h"
|
|
#include "infcall.h"
|
|
#include "objfiles.h"
|
|
#include "linux-fork.h"
|
|
#include "linux-nat.h"
|
|
#include "gdbthread.h"
|
|
#include "source.h"
|
|
|
|
#include "nat/gdb_ptrace.h"
|
|
#include "gdb_wait.h"
|
|
#include <dirent.h>
|
|
#include <ctype.h>
|
|
|
|
struct fork_info *fork_list;
|
|
static int highest_fork_num;
|
|
|
|
/* Prevent warning from -Wmissing-prototypes. */
|
|
extern void _initialize_linux_fork (void);
|
|
|
|
/* Fork list data structure: */
|
|
struct fork_info
|
|
{
|
|
struct fork_info *next;
|
|
ptid_t ptid;
|
|
ptid_t parent_ptid;
|
|
int num; /* Convenient handle (GDB fork id). */
|
|
struct regcache *savedregs; /* Convenient for info fork, saves
|
|
having to actually switch contexts. */
|
|
int clobber_regs; /* True if we should restore saved regs. */
|
|
off_t *filepos; /* Set of open file descriptors' offsets. */
|
|
int maxfd;
|
|
};
|
|
|
|
/* Fork list methods: */
|
|
|
|
int
|
|
forks_exist_p (void)
|
|
{
|
|
return (fork_list != NULL);
|
|
}
|
|
|
|
/* Add a fork to the internal fork list. */
|
|
|
|
struct fork_info *
|
|
add_fork (pid_t pid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
if (fork_list == NULL && pid != ptid_get_pid (inferior_ptid))
|
|
{
|
|
/* Special case -- if this is the first fork in the list
|
|
(the list is hitherto empty), and if this new fork is
|
|
NOT the current inferior_ptid, then add inferior_ptid
|
|
first, as a special zeroeth fork id. */
|
|
highest_fork_num = -1;
|
|
add_fork (ptid_get_pid (inferior_ptid)); /* safe recursion */
|
|
}
|
|
|
|
fp = XCNEW (struct fork_info);
|
|
fp->ptid = ptid_build (pid, pid, 0);
|
|
fp->num = ++highest_fork_num;
|
|
fp->next = fork_list;
|
|
fork_list = fp;
|
|
return fp;
|
|
}
|
|
|
|
static void
|
|
free_fork (struct fork_info *fp)
|
|
{
|
|
/* Notes on step-resume breakpoints: since this is a concern for
|
|
threads, let's convince ourselves that it's not a concern for
|
|
forks. There are two ways for a fork_info to be created. First,
|
|
by the checkpoint command, in which case we're at a gdb prompt
|
|
and there can't be any step-resume breakpoint. Second, by a fork
|
|
in the user program, in which case we *may* have stepped into the
|
|
fork call, but regardless of whether we follow the parent or the
|
|
child, we will return to the same place and the step-resume
|
|
breakpoint, if any, will take care of itself as usual. And
|
|
unlike threads, we do not save a private copy of the step-resume
|
|
breakpoint -- so we're OK. */
|
|
|
|
if (fp)
|
|
{
|
|
if (fp->savedregs)
|
|
regcache_xfree (fp->savedregs);
|
|
if (fp->filepos)
|
|
xfree (fp->filepos);
|
|
xfree (fp);
|
|
}
|
|
}
|
|
|
|
static void
|
|
delete_fork (ptid_t ptid)
|
|
{
|
|
struct fork_info *fp, *fpprev;
|
|
|
|
fpprev = NULL;
|
|
|
|
linux_nat_forget_process (ptid_get_pid (ptid));
|
|
|
|
for (fp = fork_list; fp; fpprev = fp, fp = fp->next)
|
|
if (ptid_equal (fp->ptid, ptid))
|
|
break;
|
|
|
|
if (!fp)
|
|
return;
|
|
|
|
if (fpprev)
|
|
fpprev->next = fp->next;
|
|
else
|
|
fork_list = fp->next;
|
|
|
|
free_fork (fp);
|
|
|
|
/* Special case: if there is now only one process in the list,
|
|
and if it is (hopefully!) the current inferior_ptid, then
|
|
remove it, leaving the list empty -- we're now down to the
|
|
default case of debugging a single process. */
|
|
if (fork_list != NULL && fork_list->next == NULL &&
|
|
ptid_equal (fork_list->ptid, inferior_ptid))
|
|
{
|
|
/* Last fork -- delete from list and handle as solo process
|
|
(should be a safe recursion). */
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
}
|
|
|
|
/* Find a fork_info by matching PTID. */
|
|
static struct fork_info *
|
|
find_fork_ptid (ptid_t ptid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (ptid_equal (fp->ptid, ptid))
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Find a fork_info by matching ID. */
|
|
static struct fork_info *
|
|
find_fork_id (int num)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (fp->num == num)
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Find a fork_info by matching pid. */
|
|
extern struct fork_info *
|
|
find_fork_pid (pid_t pid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (pid == ptid_get_pid (fp->ptid))
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static ptid_t
|
|
fork_id_to_ptid (int num)
|
|
{
|
|
struct fork_info *fork = find_fork_id (num);
|
|
if (fork)
|
|
return fork->ptid;
|
|
else
|
|
return pid_to_ptid (-1);
|
|
}
|
|
|
|
static void
|
|
init_fork_list (void)
|
|
{
|
|
struct fork_info *fp, *fpnext;
|
|
|
|
if (!fork_list)
|
|
return;
|
|
|
|
for (fp = fork_list; fp; fp = fpnext)
|
|
{
|
|
fpnext = fp->next;
|
|
free_fork (fp);
|
|
}
|
|
|
|
fork_list = NULL;
|
|
}
|
|
|
|
/* Fork list <-> gdb interface. */
|
|
|
|
/* Utility function for fork_load/fork_save.
|
|
Calls lseek in the (current) inferior process. */
|
|
|
|
static off_t
|
|
call_lseek (int fd, off_t offset, int whence)
|
|
{
|
|
char exp[80];
|
|
|
|
snprintf (&exp[0], sizeof (exp), "lseek (%d, %ld, %d)",
|
|
fd, (long) offset, whence);
|
|
return (off_t) parse_and_eval_long (&exp[0]);
|
|
}
|
|
|
|
/* Load infrun state for the fork PTID. */
|
|
|
|
static void
|
|
fork_load_infrun_state (struct fork_info *fp)
|
|
{
|
|
extern void nullify_last_target_wait_ptid ();
|
|
int i;
|
|
|
|
linux_nat_switch_fork (fp->ptid);
|
|
|
|
if (fp->savedregs && fp->clobber_regs)
|
|
regcache_cpy (get_current_regcache (), fp->savedregs);
|
|
|
|
registers_changed ();
|
|
reinit_frame_cache ();
|
|
|
|
stop_pc = regcache_read_pc (get_current_regcache ());
|
|
nullify_last_target_wait_ptid ();
|
|
|
|
/* Now restore the file positions of open file descriptors. */
|
|
if (fp->filepos)
|
|
{
|
|
for (i = 0; i <= fp->maxfd; i++)
|
|
if (fp->filepos[i] != (off_t) -1)
|
|
call_lseek (i, fp->filepos[i], SEEK_SET);
|
|
/* NOTE: I can get away with using SEEK_SET and SEEK_CUR because
|
|
this is native-only. If it ever has to be cross, we'll have
|
|
to rethink this. */
|
|
}
|
|
}
|
|
|
|
/* Save infrun state for the fork PTID.
|
|
Exported for use by linux child_follow_fork. */
|
|
|
|
static void
|
|
fork_save_infrun_state (struct fork_info *fp, int clobber_regs)
|
|
{
|
|
char path[PATH_MAX];
|
|
struct dirent *de;
|
|
DIR *d;
|
|
|
|
if (fp->savedregs)
|
|
regcache_xfree (fp->savedregs);
|
|
|
|
fp->savedregs = regcache_dup (get_current_regcache ());
|
|
fp->clobber_regs = clobber_regs;
|
|
|
|
if (clobber_regs)
|
|
{
|
|
/* Now save the 'state' (file position) of all open file descriptors.
|
|
Unfortunately fork does not take care of that for us... */
|
|
snprintf (path, PATH_MAX, "/proc/%ld/fd",
|
|
(long) ptid_get_pid (fp->ptid));
|
|
if ((d = opendir (path)) != NULL)
|
|
{
|
|
long tmp;
|
|
|
|
fp->maxfd = 0;
|
|
while ((de = readdir (d)) != NULL)
|
|
{
|
|
/* Count open file descriptors (actually find highest
|
|
numbered). */
|
|
tmp = strtol (&de->d_name[0], NULL, 10);
|
|
if (fp->maxfd < tmp)
|
|
fp->maxfd = tmp;
|
|
}
|
|
/* Allocate array of file positions. */
|
|
fp->filepos = XRESIZEVEC (off_t, fp->filepos, fp->maxfd + 1);
|
|
|
|
/* Initialize to -1 (invalid). */
|
|
for (tmp = 0; tmp <= fp->maxfd; tmp++)
|
|
fp->filepos[tmp] = -1;
|
|
|
|
/* Now find actual file positions. */
|
|
rewinddir (d);
|
|
while ((de = readdir (d)) != NULL)
|
|
if (isdigit (de->d_name[0]))
|
|
{
|
|
tmp = strtol (&de->d_name[0], NULL, 10);
|
|
fp->filepos[tmp] = call_lseek (tmp, 0, SEEK_CUR);
|
|
}
|
|
closedir (d);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Kill 'em all, let God sort 'em out... */
|
|
|
|
void
|
|
linux_fork_killall (void)
|
|
{
|
|
/* Walk list and kill every pid. No need to treat the
|
|
current inferior_ptid as special (we do not return a
|
|
status for it) -- however any process may be a child
|
|
or a parent, so may get a SIGCHLD from a previously
|
|
killed child. Wait them all out. */
|
|
struct fork_info *fp;
|
|
pid_t pid, ret;
|
|
int status;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
{
|
|
pid = ptid_get_pid (fp->ptid);
|
|
do {
|
|
/* Use SIGKILL instead of PTRACE_KILL because the former works even
|
|
if the thread is running, while the later doesn't. */
|
|
kill (pid, SIGKILL);
|
|
ret = waitpid (pid, &status, 0);
|
|
/* We might get a SIGCHLD instead of an exit status. This is
|
|
aggravated by the first kill above - a child has just
|
|
died. MVS comment cut-and-pasted from linux-nat. */
|
|
} while (ret == pid && WIFSTOPPED (status));
|
|
}
|
|
init_fork_list (); /* Clear list, prepare to start fresh. */
|
|
}
|
|
|
|
/* The current inferior_ptid has exited, but there are other viable
|
|
forks to debug. Delete the exiting one and context-switch to the
|
|
first available. */
|
|
|
|
void
|
|
linux_fork_mourn_inferior (void)
|
|
{
|
|
/* Wait just one more time to collect the inferior's exit status.
|
|
Do not check whether this succeeds though, since we may be
|
|
dealing with a process that we attached to. Such a process will
|
|
only report its exit status to its original parent. */
|
|
int status;
|
|
|
|
waitpid (ptid_get_pid (inferior_ptid), &status, 0);
|
|
|
|
/* OK, presumably inferior_ptid is the one who has exited.
|
|
We need to delete that one from the fork_list, and switch
|
|
to the next available fork. */
|
|
delete_fork (inferior_ptid);
|
|
|
|
/* There should still be a fork - if there's only one left,
|
|
delete_fork won't remove it, because we haven't updated
|
|
inferior_ptid yet. */
|
|
gdb_assert (fork_list);
|
|
|
|
fork_load_infrun_state (fork_list);
|
|
printf_filtered (_("[Switching to %s]\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
/* If there's only one fork, switch back to non-fork mode. */
|
|
if (fork_list->next == NULL)
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
|
|
/* The current inferior_ptid is being detached, but there are other
|
|
viable forks to debug. Detach and delete it and context-switch to
|
|
the first available. */
|
|
|
|
void
|
|
linux_fork_detach (const char *args, int from_tty)
|
|
{
|
|
/* OK, inferior_ptid is the one we are detaching from. We need to
|
|
delete it from the fork_list, and switch to the next available
|
|
fork. */
|
|
|
|
if (ptrace (PTRACE_DETACH, ptid_get_pid (inferior_ptid), 0, 0))
|
|
error (_("Unable to detach %s"), target_pid_to_str (inferior_ptid));
|
|
|
|
delete_fork (inferior_ptid);
|
|
|
|
/* There should still be a fork - if there's only one left,
|
|
delete_fork won't remove it, because we haven't updated
|
|
inferior_ptid yet. */
|
|
gdb_assert (fork_list);
|
|
|
|
fork_load_infrun_state (fork_list);
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("[Switching to %s]\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
/* If there's only one fork, switch back to non-fork mode. */
|
|
if (fork_list->next == NULL)
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
|
|
static void
|
|
inferior_call_waitpid_cleanup (void *fp)
|
|
{
|
|
struct fork_info *oldfp = (struct fork_info *) fp;
|
|
|
|
if (oldfp)
|
|
{
|
|
/* Switch back to inferior_ptid. */
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (oldfp);
|
|
insert_breakpoints ();
|
|
}
|
|
}
|
|
|
|
static int
|
|
inferior_call_waitpid (ptid_t pptid, int pid)
|
|
{
|
|
struct objfile *waitpid_objf;
|
|
struct value *waitpid_fn = NULL;
|
|
struct value *argv[4], *retv;
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
struct fork_info *oldfp = NULL, *newfp = NULL;
|
|
struct cleanup *old_cleanup;
|
|
int ret = -1;
|
|
|
|
if (!ptid_equal (pptid, inferior_ptid))
|
|
{
|
|
/* Switch to pptid. */
|
|
oldfp = find_fork_ptid (inferior_ptid);
|
|
gdb_assert (oldfp != NULL);
|
|
newfp = find_fork_ptid (pptid);
|
|
gdb_assert (newfp != NULL);
|
|
fork_save_infrun_state (oldfp, 1);
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (newfp);
|
|
insert_breakpoints ();
|
|
}
|
|
|
|
old_cleanup = make_cleanup (inferior_call_waitpid_cleanup, oldfp);
|
|
|
|
/* Get the waitpid_fn. */
|
|
if (lookup_minimal_symbol ("waitpid", NULL, NULL).minsym != NULL)
|
|
waitpid_fn = find_function_in_inferior ("waitpid", &waitpid_objf);
|
|
if (!waitpid_fn
|
|
&& lookup_minimal_symbol ("_waitpid", NULL, NULL).minsym != NULL)
|
|
waitpid_fn = find_function_in_inferior ("_waitpid", &waitpid_objf);
|
|
if (!waitpid_fn)
|
|
goto out;
|
|
|
|
/* Get the argv. */
|
|
argv[0] = value_from_longest (builtin_type (gdbarch)->builtin_int, pid);
|
|
argv[1] = value_from_pointer (builtin_type (gdbarch)->builtin_data_ptr, 0);
|
|
argv[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
|
|
argv[3] = 0;
|
|
|
|
retv = call_function_by_hand (waitpid_fn, 3, argv);
|
|
if (value_as_long (retv) < 0)
|
|
goto out;
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
do_cleanups (old_cleanup);
|
|
return ret;
|
|
}
|
|
|
|
/* Fork list <-> user interface. */
|
|
|
|
static void
|
|
delete_checkpoint_command (char *args, int from_tty)
|
|
{
|
|
ptid_t ptid, pptid;
|
|
struct fork_info *fi;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to delete)"));
|
|
|
|
ptid = fork_id_to_ptid (parse_and_eval_long (args));
|
|
if (ptid_equal (ptid, minus_one_ptid))
|
|
error (_("No such checkpoint id, %s"), args);
|
|
|
|
if (ptid_equal (ptid, inferior_ptid))
|
|
error (_("\
|
|
Please switch to another checkpoint before deleting the current one"));
|
|
|
|
if (ptrace (PTRACE_KILL, ptid_get_pid (ptid), 0, 0))
|
|
error (_("Unable to kill pid %s"), target_pid_to_str (ptid));
|
|
|
|
fi = find_fork_ptid (ptid);
|
|
gdb_assert (fi);
|
|
pptid = fi->parent_ptid;
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("Killed %s\n"), target_pid_to_str (ptid));
|
|
|
|
delete_fork (ptid);
|
|
|
|
/* If fi->parent_ptid is not a part of lwp but it's a part of checkpoint
|
|
list, waitpid the ptid.
|
|
If fi->parent_ptid is a part of lwp and it is stoped, waitpid the
|
|
ptid. */
|
|
if ((!find_thread_ptid (pptid) && find_fork_ptid (pptid))
|
|
|| (find_thread_ptid (pptid) && is_stopped (pptid)))
|
|
{
|
|
if (inferior_call_waitpid (pptid, ptid_get_pid (ptid)))
|
|
warning (_("Unable to wait pid %s"), target_pid_to_str (ptid));
|
|
}
|
|
}
|
|
|
|
static void
|
|
detach_checkpoint_command (char *args, int from_tty)
|
|
{
|
|
ptid_t ptid;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to detach)"));
|
|
|
|
ptid = fork_id_to_ptid (parse_and_eval_long (args));
|
|
if (ptid_equal (ptid, minus_one_ptid))
|
|
error (_("No such checkpoint id, %s"), args);
|
|
|
|
if (ptid_equal (ptid, inferior_ptid))
|
|
error (_("\
|
|
Please switch to another checkpoint before detaching the current one"));
|
|
|
|
if (ptrace (PTRACE_DETACH, ptid_get_pid (ptid), 0, 0))
|
|
error (_("Unable to detach %s"), target_pid_to_str (ptid));
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("Detached %s\n"), target_pid_to_str (ptid));
|
|
|
|
delete_fork (ptid);
|
|
}
|
|
|
|
/* Print information about currently known checkpoints. */
|
|
|
|
static void
|
|
info_checkpoints_command (char *arg, int from_tty)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
struct symtab_and_line sal;
|
|
struct fork_info *fp;
|
|
ULONGEST pc;
|
|
int requested = -1;
|
|
struct fork_info *printed = NULL;
|
|
|
|
if (arg && *arg)
|
|
requested = (int) parse_and_eval_long (arg);
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
{
|
|
if (requested > 0 && fp->num != requested)
|
|
continue;
|
|
|
|
printed = fp;
|
|
if (ptid_equal (fp->ptid, inferior_ptid))
|
|
{
|
|
printf_filtered ("* ");
|
|
pc = regcache_read_pc (get_current_regcache ());
|
|
}
|
|
else
|
|
{
|
|
printf_filtered (" ");
|
|
pc = regcache_read_pc (fp->savedregs);
|
|
}
|
|
printf_filtered ("%d %s", fp->num, target_pid_to_str (fp->ptid));
|
|
if (fp->num == 0)
|
|
printf_filtered (_(" (main process)"));
|
|
printf_filtered (_(" at "));
|
|
fputs_filtered (paddress (gdbarch, pc), gdb_stdout);
|
|
|
|
sal = find_pc_line (pc, 0);
|
|
if (sal.symtab)
|
|
printf_filtered (_(", file %s"),
|
|
symtab_to_filename_for_display (sal.symtab));
|
|
if (sal.line)
|
|
printf_filtered (_(", line %d"), sal.line);
|
|
if (!sal.symtab && !sal.line)
|
|
{
|
|
struct bound_minimal_symbol msym;
|
|
|
|
msym = lookup_minimal_symbol_by_pc (pc);
|
|
if (msym.minsym)
|
|
printf_filtered (", <%s>", MSYMBOL_LINKAGE_NAME (msym.minsym));
|
|
}
|
|
|
|
putchar_filtered ('\n');
|
|
}
|
|
if (printed == NULL)
|
|
{
|
|
if (requested > 0)
|
|
printf_filtered (_("No checkpoint number %d.\n"), requested);
|
|
else
|
|
printf_filtered (_("No checkpoints.\n"));
|
|
}
|
|
}
|
|
|
|
/* The PID of the process we're checkpointing. */
|
|
static int checkpointing_pid = 0;
|
|
|
|
int
|
|
linux_fork_checkpointing_p (int pid)
|
|
{
|
|
return (checkpointing_pid == pid);
|
|
}
|
|
|
|
/* Callback for iterate over threads. Used to check whether
|
|
the current inferior is multi-threaded. Returns true as soon
|
|
as it sees the second thread of the current inferior. */
|
|
|
|
static int
|
|
inf_has_multiple_thread_cb (struct thread_info *tp, void *data)
|
|
{
|
|
int *count_p = (int *) data;
|
|
|
|
if (current_inferior ()->pid == ptid_get_pid (tp->ptid))
|
|
(*count_p)++;
|
|
|
|
/* Stop the iteration if multiple threads have been detected. */
|
|
return *count_p > 1;
|
|
}
|
|
|
|
/* Return true if the current inferior is multi-threaded. */
|
|
|
|
static int
|
|
inf_has_multiple_threads (void)
|
|
{
|
|
int count = 0;
|
|
|
|
iterate_over_threads (inf_has_multiple_thread_cb, &count);
|
|
return (count > 1);
|
|
}
|
|
|
|
static void
|
|
checkpoint_command (char *args, int from_tty)
|
|
{
|
|
struct objfile *fork_objf;
|
|
struct gdbarch *gdbarch;
|
|
struct target_waitstatus last_target_waitstatus;
|
|
ptid_t last_target_ptid;
|
|
struct value *fork_fn = NULL, *ret;
|
|
struct fork_info *fp;
|
|
pid_t retpid;
|
|
struct cleanup *old_chain;
|
|
|
|
if (!target_has_execution)
|
|
error (_("The program is not being run."));
|
|
|
|
/* Ensure that the inferior is not multithreaded. */
|
|
update_thread_list ();
|
|
if (inf_has_multiple_threads ())
|
|
error (_("checkpoint: can't checkpoint multiple threads."));
|
|
|
|
/* Make the inferior fork, record its (and gdb's) state. */
|
|
|
|
if (lookup_minimal_symbol ("fork", NULL, NULL).minsym != NULL)
|
|
fork_fn = find_function_in_inferior ("fork", &fork_objf);
|
|
if (!fork_fn)
|
|
if (lookup_minimal_symbol ("_fork", NULL, NULL).minsym != NULL)
|
|
fork_fn = find_function_in_inferior ("fork", &fork_objf);
|
|
if (!fork_fn)
|
|
error (_("checkpoint: can't find fork function in inferior."));
|
|
|
|
gdbarch = get_objfile_arch (fork_objf);
|
|
ret = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
|
|
|
|
/* Tell linux-nat.c that we're checkpointing this inferior. */
|
|
old_chain = make_cleanup_restore_integer (&checkpointing_pid);
|
|
checkpointing_pid = ptid_get_pid (inferior_ptid);
|
|
|
|
ret = call_function_by_hand (fork_fn, 0, &ret);
|
|
do_cleanups (old_chain);
|
|
if (!ret) /* Probably can't happen. */
|
|
error (_("checkpoint: call_function_by_hand returned null."));
|
|
|
|
retpid = value_as_long (ret);
|
|
get_last_target_status (&last_target_ptid, &last_target_waitstatus);
|
|
|
|
fp = find_fork_pid (retpid);
|
|
|
|
if (from_tty)
|
|
{
|
|
int parent_pid;
|
|
|
|
printf_filtered (_("checkpoint %d: fork returned pid %ld.\n"),
|
|
fp != NULL ? fp->num : -1, (long) retpid);
|
|
if (info_verbose)
|
|
{
|
|
parent_pid = ptid_get_lwp (last_target_ptid);
|
|
if (parent_pid == 0)
|
|
parent_pid = ptid_get_pid (last_target_ptid);
|
|
printf_filtered (_(" gdb says parent = %ld.\n"),
|
|
(long) parent_pid);
|
|
}
|
|
}
|
|
|
|
if (!fp)
|
|
error (_("Failed to find new fork"));
|
|
fork_save_infrun_state (fp, 1);
|
|
fp->parent_ptid = last_target_ptid;
|
|
}
|
|
|
|
static void
|
|
linux_fork_context (struct fork_info *newfp, int from_tty)
|
|
{
|
|
/* Now we attempt to switch processes. */
|
|
struct fork_info *oldfp;
|
|
|
|
gdb_assert (newfp != NULL);
|
|
|
|
oldfp = find_fork_ptid (inferior_ptid);
|
|
gdb_assert (oldfp != NULL);
|
|
|
|
fork_save_infrun_state (oldfp, 1);
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (newfp);
|
|
insert_breakpoints ();
|
|
|
|
printf_filtered (_("Switching to %s\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
|
|
}
|
|
|
|
/* Switch inferior process (checkpoint) context, by checkpoint id. */
|
|
static void
|
|
restart_command (char *args, int from_tty)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to restart)"));
|
|
|
|
if ((fp = find_fork_id (parse_and_eval_long (args))) == NULL)
|
|
error (_("Not found: checkpoint id %s"), args);
|
|
|
|
linux_fork_context (fp, from_tty);
|
|
}
|
|
|
|
void
|
|
_initialize_linux_fork (void)
|
|
{
|
|
init_fork_list ();
|
|
|
|
/* Checkpoint command: create a fork of the inferior process
|
|
and set it aside for later debugging. */
|
|
|
|
add_com ("checkpoint", class_obscure, checkpoint_command, _("\
|
|
Fork a duplicate process (experimental)."));
|
|
|
|
/* Restart command: restore the context of a specified checkpoint
|
|
process. */
|
|
|
|
add_com ("restart", class_obscure, restart_command, _("\
|
|
restart <n>: restore program context from a checkpoint.\n\
|
|
Argument 'n' is checkpoint ID, as displayed by 'info checkpoints'."));
|
|
|
|
/* Delete checkpoint command: kill the process and remove it from
|
|
the fork list. */
|
|
|
|
add_cmd ("checkpoint", class_obscure, delete_checkpoint_command, _("\
|
|
Delete a checkpoint (experimental)."),
|
|
&deletelist);
|
|
|
|
/* Detach checkpoint command: release the process to run independently,
|
|
and remove it from the fork list. */
|
|
|
|
add_cmd ("checkpoint", class_obscure, detach_checkpoint_command, _("\
|
|
Detach from a checkpoint (experimental)."),
|
|
&detachlist);
|
|
|
|
/* Info checkpoints command: list all forks/checkpoints
|
|
currently under gdb's control. */
|
|
|
|
add_info ("checkpoints", info_checkpoints_command,
|
|
_("IDs of currently known checkpoints."));
|
|
}
|