mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 10:35:12 +08:00
9a6c7d9c02
As part of the preparation necessary for my upcoming task, I'd like to propose that we turn gdb_environ into a class. The approach taken here is simple: the class gdb_environ contains everything that is needed to manipulate the environment variables. These variables are stored in an std::vector<char *>, which can be converted to a 'char **' and passed as argument to functions that need it. The usage has not changed much. As per Pedro's suggestion, this class uses a static factory method initialization. This means that when an instance is created, it is initially empty. When needed, it has to be initialized using the static method 'from_host_environ'. As mentioned before, this is a preparation for an upcoming work that I will be posting in the next few weeks or so. For that work, I'll probably create another data structure that will contain all the environment variables that were set by the user using the 'set environment' command, because I'll need access to them. This will be much easier with the class-ification of gdb_environ. As noted, this has been regression-tested with the new version of environ.exp and no regressions were found. gdb/ChangeLog: 2017-06-20 Sergio Durigan Junior <sergiodj@redhat.com> * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add 'unittests/environ-selftests.c'. (SUBDIR_UNITTESTS_OBS): Add 'environ-selftests.o'. * charset.c (find_charset_names): Declare object 'iconv_env'. Update code to use 'iconv_env' object. Remove call to 'free_environ'. * common/environ.c: Include <utility>. (make_environ): Delete function. (free_environ): Delete function. (gdb_environ::clear): New function. (gdb_environ::operator=): New function. (gdb_environ::get): Likewise. (environ_vector): Delete function. (set_in_environ): Delete function. (gdb_environ::set): New function. (unset_in_environ): Delete function. (gdb_environ::unset): New function. (gdb_environ::envp): Likewise. * common/environ.h: Include <vector>. (struct gdb_environ): Delete; transform into... (class gdb_environ): ... this class. (free_environ): Delete prototype. (init_environ, get_in_environ, set_in_environ, unset_in_environ, environ_vector): Likewise. * infcmd.c (run_command_1): Update code to call 'envp' from 'gdb_environ' class. (environment_info): Update code to call methods from 'gdb_environ' class. (unset_environment_command): Likewise. (path_info): Likewise. (path_command): Likewise. * inferior.c (inferior::~inferior): Delete call to 'free_environ'. (inferior::inferior): Initialize 'environment' using the host's information. * inferior.h: Remove forward declaration of 'struct gdb_environ'. Include "environ.h". (class inferior) <environment>: Change type from 'struct gdb_environ' to 'gdb_environ'. * mi/mi-cmd-env.c (mi_cmd_env_path): Update code to call methods from 'gdb_environ' class. * solib.c (solib_find_1): Likewise * unittests/environ-selftests.c: New file. gdb/gdbserver/ChangeLog: 2017-06-20 Sergio Durigan Junior <sergiodj@redhat.com> * linux-low.c (linux_create_inferior): Adjust code to access the environment information via 'gdb_environ' class. * lynx-low.c (lynx_create_inferior): Likewise. * server.c (our_environ): Make it an instance of 'gdb_environ'. (get_environ): Return a pointer to 'our_environ'. (captured_main): Initialize 'our_environ'. * server.h (get_environ): Adjust prototype. * spu-low.c (spu_create_inferior): Adjust code to access the environment information via 'gdb_environ' class.
166 lines
4.7 KiB
C
166 lines
4.7 KiB
C
/* Common definitions for remote server for GDB.
|
|
Copyright (C) 1993-2017 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/>. */
|
|
|
|
#ifndef SERVER_H
|
|
#define SERVER_H
|
|
|
|
#include "common-defs.h"
|
|
|
|
gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *));
|
|
|
|
#ifdef __MINGW32CE__
|
|
#include "wincecompat.h"
|
|
#endif
|
|
|
|
#include "version.h"
|
|
|
|
#if !HAVE_DECL_STRERROR
|
|
#ifndef strerror
|
|
extern char *strerror (int); /* X3.159-1989 4.11.6.2 */
|
|
#endif
|
|
#endif
|
|
|
|
#if !HAVE_DECL_PERROR
|
|
#ifndef perror
|
|
extern void perror (const char *);
|
|
#endif
|
|
#endif
|
|
|
|
#if !HAVE_DECL_VASPRINTF
|
|
extern int vasprintf(char **strp, const char *fmt, va_list ap);
|
|
#endif
|
|
#if !HAVE_DECL_VSNPRINTF
|
|
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
|
|
#endif
|
|
|
|
#ifdef IN_PROCESS_AGENT
|
|
# define PROG "ipa"
|
|
#else
|
|
# define PROG "gdbserver"
|
|
#endif
|
|
|
|
#include "buffer.h"
|
|
#include "xml-utils.h"
|
|
#include "regcache.h"
|
|
#include "gdb_signals.h"
|
|
#include "target.h"
|
|
#include "mem-break.h"
|
|
#include "gdbthread.h"
|
|
#include "inferiors.h"
|
|
#include "environ.h"
|
|
|
|
/* Target-specific functions */
|
|
|
|
void initialize_low ();
|
|
|
|
/* Public variables in server.c */
|
|
|
|
extern ptid_t cont_thread;
|
|
extern ptid_t general_thread;
|
|
|
|
extern int server_waiting;
|
|
extern int pass_signals[];
|
|
extern int program_signals[];
|
|
extern int program_signals_p;
|
|
|
|
extern int disable_packet_vCont;
|
|
extern int disable_packet_Tthread;
|
|
extern int disable_packet_qC;
|
|
extern int disable_packet_qfThreadInfo;
|
|
|
|
extern char *own_buf;
|
|
|
|
extern int run_once;
|
|
extern int multi_process;
|
|
extern int report_fork_events;
|
|
extern int report_vfork_events;
|
|
extern int report_exec_events;
|
|
extern int report_thread_events;
|
|
extern int non_stop;
|
|
|
|
/* True if the "swbreak+" feature is active. In that case, GDB wants
|
|
us to report whether a trap is explained by a software breakpoint
|
|
and for the server to handle PC adjustment if necessary on this
|
|
target. Only enabled if the target supports it. */
|
|
extern int swbreak_feature;
|
|
|
|
/* True if the "hwbreak+" feature is active. In that case, GDB wants
|
|
us to report whether a trap is explained by a hardware breakpoint.
|
|
Only enabled if the target supports it. */
|
|
extern int hwbreak_feature;
|
|
|
|
extern int disable_randomization;
|
|
|
|
#if USE_WIN32API
|
|
#include <winsock2.h>
|
|
typedef SOCKET gdb_fildes_t;
|
|
#else
|
|
typedef int gdb_fildes_t;
|
|
#endif
|
|
|
|
#include "event-loop.h"
|
|
|
|
/* Functions from server.c. */
|
|
extern void handle_v_requests (char *own_buf, int packet_len,
|
|
int *new_packet_len);
|
|
extern int handle_serial_event (int err, gdb_client_data client_data);
|
|
extern int handle_target_event (int err, gdb_client_data client_data);
|
|
|
|
/* Get rid of the currently pending stop replies that match PTID. */
|
|
extern void discard_queued_stop_replies (ptid_t ptid);
|
|
|
|
/* Returns true if there's a pending stop reply that matches PTID in
|
|
the vStopped notifications queue. */
|
|
extern int in_queued_stop_replies (ptid_t ptid);
|
|
|
|
#include "remote-utils.h"
|
|
|
|
#include "utils.h"
|
|
#include "debug.h"
|
|
#include "gdb_vecs.h"
|
|
|
|
/* Maximum number of bytes to read/write at once. The value here
|
|
is chosen to fill up a packet (the headers account for the 32). */
|
|
#define MAXBUFBYTES(N) (((N)-32)/2)
|
|
|
|
/* Buffer sizes for transferring memory, registers, etc. Set to a constant
|
|
value to accomodate multiple register formats. This value must be at least
|
|
as large as the largest register set supported by gdbserver. */
|
|
#define PBUFSIZ 16384
|
|
|
|
/* Definition for an unknown syscall, used basically in error-cases. */
|
|
#define UNKNOWN_SYSCALL (-1)
|
|
|
|
/* Definition for any syscall, used for unfiltered syscall reporting. */
|
|
#define ANY_SYSCALL (-2)
|
|
|
|
/* After fork_inferior has been called, we need to adjust a few
|
|
signals and call startup_inferior to start the inferior and consume
|
|
its first events. This is done here. PID is the pid of the new
|
|
inferior and PROGRAM is its name. */
|
|
extern void post_fork_inferior (int pid, const char *program);
|
|
|
|
/* Get the gdb_environ being used in the current session. */
|
|
extern gdb_environ *get_environ ();
|
|
|
|
extern target_waitstatus last_status;
|
|
extern ptid_t last_ptid;
|
|
extern unsigned long signal_pid;
|
|
|
|
#endif /* SERVER_H */
|