#include "inflow.h"
#include "auxv.h"
#include "procfs.h"
-#include "observer.h"
+#include "observable.h"
+#include "common/scoped_fd.h"
/* This module provides the interface between GDB and the
/proc file system, which is used on many versions of Unix
static void procfs_detach (struct target_ops *, const char *, int);
static void procfs_resume (struct target_ops *,
ptid_t, int, enum gdb_signal);
-static void procfs_interrupt (struct target_ops *self, ptid_t);
static void procfs_files_info (struct target_ops *);
static void procfs_fetch_registers (struct target_ops *,
struct regcache *, int);
t->to_xfer_partial = procfs_xfer_partial;
t->to_pass_signals = procfs_pass_signals;
t->to_files_info = procfs_files_info;
- t->to_interrupt = procfs_interrupt;
t->to_update_thread_list = procfs_update_thread_list;
t->to_thread_alive = procfs_thread_alive;
{
static struct ssd *ldt_entry = NULL;
char pathname[MAX_PROC_NAME_SIZE];
- struct cleanup *old_chain = NULL;
- int fd;
/* Allocate space for one LDT entry.
This alloc must persist, because we return a pointer to it. */
/* Open the file descriptor for the LDT table. */
sprintf (pathname, "/proc/%d/ldt", pi->pid);
- if ((fd = open_with_retry (pathname, O_RDONLY)) < 0)
+ scoped_fd fd (open_with_retry (pathname, O_RDONLY));
+ if (fd.get () < 0)
{
proc_warn (pi, "proc_get_LDT_entry (open)", __LINE__);
return NULL;
}
- /* Make sure it gets closed again! */
- old_chain = make_cleanup_close (fd);
/* Now 'read' thru the table, find a match and return it. */
- while (read (fd, ldt_entry, sizeof (struct ssd)) == sizeof (struct ssd))
+ while (read (fd.get (), ldt_entry, sizeof (struct ssd))
+ == sizeof (struct ssd))
{
if (ldt_entry->sel == 0 &&
ldt_entry->bo == 0 &&
}
}
/* Loop ended, match not found. */
- do_cleanups (old_chain);
return NULL;
}
target_pid_to_str (inferior_ptid));
}
-/* Stop the child process asynchronously, as when the gdb user types
- control-c or presses a "stop" button. Works by sending
- kill(SIGINT) to the child's process group. */
-
-static void
-procfs_interrupt (struct target_ops *self, ptid_t ptid)
-{
- kill (-inferior_process_group (), SIGINT);
-}
-
/* Make it die. Wait for it to die. Clean up after it. Note: this
should only be applied to the real process, not to an LWP, because
of the check for parent-process. If we need this to work for an
struct prmap *prmaps;
struct prmap *prmap;
int funcstat;
- int map_fd;
int nmap;
- struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
struct stat sbuf;
/* Get the number of mappings, allocate space,
and read the mappings into prmaps. */
/* Open map fd. */
sprintf (pathname, "/proc/%d/map", pi->pid);
- if ((map_fd = open (pathname, O_RDONLY)) < 0)
- proc_error (pi, "iterate_over_mappings (open)", __LINE__);
- /* Make sure it gets closed again. */
- make_cleanup_close (map_fd);
+ scoped_fd map_fd (open (pathname, O_RDONLY));
+ if (map_fd.get () < 0)
+ proc_error (pi, "iterate_over_mappings (open)", __LINE__);
/* Use stat to determine the file size, and compute
the number of prmap_t objects it contains. */
- if (fstat (map_fd, &sbuf) != 0)
+ if (fstat (map_fd.get (), &sbuf) != 0)
proc_error (pi, "iterate_over_mappings (fstat)", __LINE__);
nmap = sbuf.st_size / sizeof (prmap_t);
prmaps = (struct prmap *) alloca ((nmap + 1) * sizeof (*prmaps));
- if (read (map_fd, (char *) prmaps, nmap * sizeof (*prmaps))
+ if (read (map_fd.get (), (char *) prmaps, nmap * sizeof (*prmaps))
!= (nmap * sizeof (*prmaps)))
proc_error (pi, "iterate_over_mappings (read)", __LINE__);
for (prmap = prmaps; nmap > 0; prmap++, nmap--)
if ((funcstat = (*func) (prmap, child_func, data)) != 0)
- {
- do_cleanups (cleanups);
- return funcstat;
- }
+ return funcstat;
- do_cleanups (cleanups);
return 0;
}
void
_initialize_procfs (void)
{
- observer_attach_inferior_created (procfs_inferior_created);
+ gdb::observers::inferior_created.attach (procfs_inferior_created);
add_com ("proc-trace-entry", no_class, proc_trace_sysentry_cmd,
_("Give a trace of entries into the syscall."));