b0e82b74fb
* child_info.h: Add specific exec class. * cygheap.h: New file. Contains declarations for cygwin heap. * cygheap.cc: New file. Implements cygwin heap functions. * dcrt0.cc (quoted): Simplify due to new method for passing arguments between cygwin programs. (alloc_stack_hard_way): Attempt to handle overlapped stack. (dll_crt0_1): Move child_info processing here. Accomodate new method for passing arguments between cygwin programs. Initialize cygwin heap. Establish __argc and __argv variables. (_dll_crt0): Move most of child_info processing to dll_crt0_1. (cygwin_dll_init): Remove duplication. * dtable.cc (dtable::extend): Allocate dtable using cygwin heap. (dtable::build_fhandler): Ditto for fhandler type being constructed. (dtable::dup_worker): Free new fhandler from cygwin heap on error. (dtable::select_*): Don't assume that this == fdtab. (dtable::linearize_fd_array): Delete. (dtable::delinearize_fd_array): Delete. (dtable::fixup_after_exec): New file. (dtable::vfork_child_dup): Use cygwin heap. (dtable::vfork_parent_restore): Ditto. * dtable.h: Remove obsolete methods. Add new method. * environ.cc (posify): Eliminate already_posix parameter and logic. (envsize): New function. (_addenv): Use envsize. (environ_init): Accept an argument pointing to an existing environment list. If supplied, allocate space for this in the the program's heap. * fhandler.cc (fhandler_base::operator =): Move here from fhandler.h. Use cygwin heap to allocate filenames. (fhandler_base::set_name): Allocate/free names from cygwin heap. (fhandler_base::linearize): Delete. (fhandler_base::de_linearize): Delete. (fhandler_base::operator delete): Free from cygwin heap. (fhandler_base::~fhandler_base): Ditto. * fhandler.h: Accomodate elimination of *linearize and other changes above. * fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from de_linearize. * heap.h: New file. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin heap for name. fhandler_tty::fixup_after_exec): Rename from de_linearize. * fork.cc (fork): Call cygheap_fixup_in_child. * heap.cc: Use declarations in heap.h. * malloc.cc: Sprinkle assertions throughout to catch attempts to free/realloc something from the cygwin heap. * path.cc: Throughout, eliminate use of per-thread cache for cwd. Use cwd_* functions rather than cwd_* variables to access cwd_win32 and cwd_posix. (cwd_win32): New function. (cwd_posix): New function. (cwd_hash): New function. (cwd_fixup_after_exec): New function. * path.h: Accomodate path.cc changes. * pinfo.cc (pinfo_init): Accept a pointer to an environment table. Pass this to environ_init. Eliminate old 'title' tests. * pinfo.h: Accomodate above change in argument. * spawn.cc (struct av): New method for building argv list. (av::unshift): New method. (spawn_guts): Allocate everything that the child process needs in the cygwin heap and pass a pointer to this to the child. Build argv list using new method. Eliminate delinearize stuff. * thread.h: Eliminate _cwd_win32 and _cwd_posix buffers. * winsup.h: Eliminate obsolete functions. Add envsize() declaration.
103 lines
2.3 KiB
C++
103 lines
2.3 KiB
C++
/* childinfo.h: shared child info for cygwin
|
|
|
|
Copyright 2000 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
enum
|
|
{
|
|
PROC_MAGIC = 0xaf08f000,
|
|
PROC_FORK = PROC_MAGIC + 1,
|
|
PROC_EXEC = PROC_MAGIC + 2,
|
|
PROC_SPAWN = PROC_MAGIC + 3,
|
|
PROC_FORK1 = PROC_MAGIC + 4, // Newer versions provide stack
|
|
// location information
|
|
PROC_SPAWN1 = PROC_MAGIC + 5
|
|
};
|
|
|
|
#define PROC_MAGIC_MASK 0xff00f000
|
|
#define PROC_MAGIC_GENERIC 0xaf00f000
|
|
#define PROC_MAGIC_VER_MASK 0x0ff0000
|
|
|
|
#define EXEC_MAGIC_SIZE sizeof(child_info)
|
|
class child_info
|
|
{
|
|
public:
|
|
DWORD zero[1]; // must be zeroed
|
|
DWORD cb; // size of this record
|
|
DWORD type; // type of record
|
|
int cygpid; // cygwin pid of child process
|
|
HANDLE subproc_ready; // used for synchronization with parent
|
|
HANDLE shared_h;
|
|
HANDLE console_h;
|
|
HANDLE parent_alive; // handle of thread used to track children
|
|
};
|
|
|
|
class child_info_fork: public child_info
|
|
{
|
|
public:
|
|
HANDLE forker_finished;// for synchronization with child
|
|
DWORD stacksize; // size of parent stack
|
|
void *heaptop;
|
|
void *heapbase;
|
|
void *heapptr;
|
|
jmp_buf jmp; // where child will jump to
|
|
void *stacktop; // location of top of parent stack
|
|
void *stackbottom; // location of bottom of parent stack
|
|
};
|
|
|
|
class fhandler_base;
|
|
|
|
class cygheap_exec_info
|
|
{
|
|
public:
|
|
char *old_title;
|
|
fhandler_base **fds;
|
|
size_t nfds;
|
|
int argc;
|
|
char **argv;
|
|
char **environ;
|
|
HANDLE myself_pinfo;
|
|
char *cwd_posix;
|
|
char *cwd_win32;
|
|
DWORD cwd_hash;
|
|
};
|
|
|
|
class child_info_spawn: public child_info
|
|
{
|
|
public:
|
|
HANDLE parent;
|
|
void *cygheap;
|
|
void *cygheap_max;
|
|
cygheap_exec_info *moreinfo;
|
|
|
|
child_info_spawn (): parent (NULL), cygheap (NULL),
|
|
cygheap_max (NULL), moreinfo (NULL) {}
|
|
~child_info_spawn ()
|
|
{
|
|
if (parent)
|
|
CloseHandle (parent);
|
|
if (moreinfo)
|
|
{
|
|
if (moreinfo->old_title)
|
|
cfree (moreinfo->old_title);
|
|
if (moreinfo->environ)
|
|
{
|
|
for (char **e = moreinfo->environ; *e; e++)
|
|
cfree (*e);
|
|
cfree (moreinfo->environ);
|
|
}
|
|
CloseHandle (moreinfo->myself_pinfo);
|
|
cfree (moreinfo);
|
|
}
|
|
}
|
|
};
|
|
|
|
void __stdcall init_child_info (DWORD, child_info *, int, HANDLE);
|
|
|
|
extern child_info_fork *child_proc_info;
|