* @param path Path to the ELF file
* @param low_addr Base address of the executable
* @param memsz In-memory size of the executable
+ * @param is_pic Whether the executable is position independent
+ * code (PIC)
* @returns Pointer to the new so_info on success,
* NULL on failure.
*/
BT_HIDDEN
struct so_info *so_info_create(const char *path, uint64_t low_addr,
- uint64_t memsz);
+ uint64_t memsz, bool is_pic);
/**
* Destroy the given so_info instance
}
static
-void handle_statedump_soinfo_event(struct debug_info *debug_info,
- struct ctf_event_definition *event_def)
+void handle_bin_info_event(struct debug_info *debug_info,
+ struct ctf_event_definition *event_def, bool has_pic_field)
{
struct bt_definition *baddr_def = NULL;
struct bt_definition *memsz_def = NULL;
struct bt_definition *sopath_def = NULL;
+ struct bt_definition *is_pic_def = NULL;
struct bt_definition *vpid_def = NULL;
struct bt_definition *event_fields_def = NULL;
struct bt_definition *sec_def = NULL;
int64_t vpid;
const char *sopath;
gpointer key = NULL;
+ bool is_pic;
event_fields_def = (struct bt_definition *) event_def->event_fields;
sec_def = (struct bt_definition *)
goto end;
}
+ if (has_pic_field) {
+ is_pic_def = bt_lookup_definition(event_fields_def, "_is_pic");
+ if (!is_pic_def) {
+ goto end;
+ }
+
+ if (is_pic_def->declaration->id != CTF_TYPE_INTEGER) {
+ goto end;
+ }
+
+ is_pic = (bt_get_unsigned_int(is_pic_def) == 1);
+ } else {
+ /*
+ * dlopen has no is_pic field, because the shared
+ * object is always PIC.
+ */
+ is_pic = true;
+ }
+
vpid_def = bt_lookup_definition(sec_def, "_vpid");
if (!vpid_def) {
goto end;
goto end;
}
- so = so_info_create(sopath, baddr, memsz);
+ so = so_info_create(sopath, baddr, memsz, is_pic);
if (!so) {
goto end;
}
return;
}
+static inline
+void handle_soinfo_event(struct debug_info *debug_info,
+ struct ctf_event_definition *event_def)
+{
+ handle_bin_info_event(debug_info, event_def, true);
+}
+
+static inline
+void handle_dlopen_event(struct debug_info *debug_info,
+ struct ctf_event_definition *event_def)
+{
+ handle_bin_info_event(debug_info, event_def, false);
+}
+
+
static
void handle_statedump_start(struct debug_info *debug_info,
struct ctf_event_definition *event_def)
event_class = g_ptr_array_index(stream_class->events_by_id,
event->stream->event_id);
- if (event_class->name == debug_info->q_statedump_soinfo ||
- event_class->name == debug_info->q_dl_open) {
- /* State dump/dlopen() */
- handle_statedump_soinfo_event(debug_info, event);
+ if (event_class->name == debug_info->q_statedump_soinfo) {
+ /* State dump */
+ handle_soinfo_event(debug_info, event);
+ } else if (event_class->name == debug_info->q_dl_open) {
+ handle_dlopen_event(debug_info, event);
} else if (event_class->name == debug_info->q_statedump_start) {
/* Start state dump */
handle_statedump_start(debug_info, event);
BT_HIDDEN
struct so_info *so_info_create(const char *path, uint64_t low_addr,
- uint64_t memsz)
+ uint64_t memsz, bool is_pic)
{
struct so_info *so = NULL;
GElf_Ehdr *ehdr = NULL;
goto error;
}
- /* Position independent code has an e_type value of ET_DYN. */
- so->is_pic = ehdr->e_type == ET_DYN;
+ so->is_pic = is_pic;
so->memsz = memsz;
so->low_addr = low_addr;
so->high_addr = so->low_addr + so->memsz;
snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_BUILD_ID);
- so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+ so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
ok(so != NULL, "so_info_create succesful");
/* Test setting build_id */
snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_DEBUG_LINK);
- so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+ so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
ok(so != NULL, "so_info_create succesful");
/* Test setting debug link */
snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_ELF);
- so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+ so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
ok(so != NULL, "so_info_create succesful");
/* Test function name lookup (with ELF) */
snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME);
- so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+ so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
ok(so != NULL, "so_info_create succesful");
/* Test so_info_has_address */