From 84c7d4093270dc07de4531ab6648a12daaff77c3 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 29 Jul 2000 16:24:59 +0000 Subject: * include/cygwin/version.h: Bump DLL minor version number to 5 due to all of the changes below. Redefine process structure to avoid a fixed size table. Redefine pinfo/_pinfo classes. Use these throughout. * dcrt0.cc (dll_crt0_1): Accomodate set_myself argument change. (__api_fatal): Accomodate _pinfo::record_death argument change. * exceptions.cc (really_exit): Ditto. (sig_handle_tty_stop): Use pinfo constructor to access process info. (events_init): Don't create pinfo_mutex since it is no longer required. * external.cc (fillout_pinfo): Use winpids class to iterate over all system pids. (cygwin_internal): lock_pinfo_for_update and unlock_pinfo are now noops. * fhandler_termios.cc (fhandler_termios::set_ctty): Use pinfo constructor to access process info. * fork.cc (fork): Reorganize to initialize child info after the child has started since that is when we know the child's winpid, which is necessary to allocate the pinfo shared memory. * mmap.cc (recreate_mmaps_after_fork): Change arg type to _pinfo. * pinfo.cc: Rename pinfo methods to _pinfo throughout. Eliminate pinfo_list stuff. (set_myself): Accept a pid argument now. Call pinfo initializer to initialize myself. Detect when this is an "execed" process and create an "indirect" pid block. (pinfo_init): Accomodate set_myself arg change. (procinfo): Remove. (pinfo::lock_pinfo): Remove. (pinfo::unlock_pinfo): Remove. (pinfo::init): New method. Allocates shared memory space for process pinfo structure. (pinfo::record_death): Don't call locking functions. (cygwin_winpid_to_pid): Simplify by using new pinfo constructor. (EnumProcessesW95): New function for iterating over processes on Windows 95. (winpids::winpids): New constructor for winpids class. Sets up a list of process ids. (enum_init): Initialize w95/wnt pid enumerators. * shared.cc (shared-info::initialize): Remove pid initialization. * shared.h: Move pinfo stuff into pinfo.h. (class shared_info): Remove pinfo_list element. * signal.cc (kill_worker): Use pinfo constructor to access process info. (kill_pgrp): Ditto. Use winpids methods to access list of processes. * sigproc.cc: Throughout, modify to use _pinfo where appropriate. (proc_exists (pid_t)): New function. Determines if a process exists based on the pid. (proc_exists (_pinfo *p): Use new proc_exists function above. (proc_subproc): Copy pinfo stuff around rather than _pinfo pointers. Try to be careful about releasing shared memory when we don't need it anymore. Remove pinfo locks. (remove_zombies): Remove pinfo memory when zombie is going away. * sigproc.h: Reflect _pinfo/pinfo changes in sigproc.cc. * spawn.cc (spawn_guts): Eliminate pinfo *child argument. Reorganize to only initialize child pinfo after process has been started and we know the windows pid. (_spawnve): Reflect spawn_guts changes. * syscalls.cc (setpgid): Use pinfo constructor to access process info. (getpgid): Ditto. (internal_getlogin): Use _pinfo. * winsup.h: Eliminate pinfo_mutex. Eliminate spawn_guts declaration since it is static now. Reflect set_myself argument change. * include/sys/cygwin.h: Add some PID_* enums to accomodate new pinfo stuff. * include/cygwin/version.h: Update minor version for cygdrive changes below. --- winsup/cygwin/shared.h | 138 +------------------------------------------------ 1 file changed, 1 insertion(+), 137 deletions(-) (limited to 'winsup/cygwin/shared.h') diff --git a/winsup/cygwin/shared.h b/winsup/cygwin/shared.h index fa14492cb..851bad41b 100644 --- a/winsup/cygwin/shared.h +++ b/winsup/cygwin/shared.h @@ -41,140 +41,6 @@ public: void process_queue (); }; -/******** Process Table ********/ - -/* Signal constants (have to define them here, unfortunately) */ - -enum -{ - __SIGFLUSH = -2, - __SIGSTRACE = -1, - __SIGCHILDSTOPPED = 0, - __SIGOFFSET = 3 -}; - -class pinfo -{ - public: - - /* If hProcess is set, it's because it came from a - CreateProcess call. This means it's process relative - to the thing which created the process. That's ok because - we only use this handle from the parent. */ - HANDLE hProcess; - - HANDLE parent_alive; - - /* dwProcessId contains the processid used for sending signals. It - * will be reset in a child process when it is capable of receiving - * signals. - */ - DWORD dwProcessId; - - /* User information. - The information is derived from the GetUserName system call, - with the name looked up in /etc/passwd and assigned a default value - if not found. This data resides in the shared data area (allowing - tasks to store whatever they want here) so it's for informational - purposes only. */ - uid_t uid; /* User ID */ - gid_t gid; /* Group ID */ - pid_t pgid; /* Process group ID */ - pid_t sid; /* Session ID */ - int ctty; /* Control tty */ - mode_t umask; - char username[MAX_USER_NAME]; /* user's name */ - - /* Extendend user information. - The information is derived from the internal_getlogin call - when on a NT system. */ - PSID psid; /* user's SID */ - char sidbuf[MAX_SID_LEN]; /* buffer for user's SID */ - char logsrv[MAX_HOST_NAME]; /* Logon server, may be FQDN */ - char domain[MAX_COMPUTERNAME_LENGTH+1]; /* Logon domain of the user */ - - /* token is needed if sexec should be called. It can be set by a call - to `set_impersonation_token()'. */ - HANDLE token; - BOOL impersonated; - uid_t orig_uid; /* Remains intact also after impersonation */ - uid_t orig_gid; /* Ditto */ - uid_t real_uid; /* Remains intact on seteuid, replaced by setuid */ - gid_t real_gid; /* Ditto */ - - /* Filled when chroot() is called by the process or one of it's parents. - Saved without trailing backslash. */ - char root[MAX_PATH+1]; - size_t rootlen; - - /* Non-zero if process was stopped by a signal. */ - char stopsig; - - struct sigaction& getsig (int); - void copysigs (pinfo *); - sigset_t& getsigmask (); - void setsigmask (sigset_t); - LONG* getsigtodo (int); - HANDLE getthread2signal (); - void setthread2signal (void *); - - /* Resources used by process. */ - long start_time; - struct rusage rusage_self; - struct rusage rusage_children; - -private: - struct sigaction sigs[NSIG]; - sigset_t sig_mask; /* one set for everything to ignore. */ - LONG _sigtodo[NSIG + __SIGOFFSET]; -#ifdef _MT_SAFE - ThreadItem* thread2signal; // NULL means means thread any other means a pthread -#endif - -public: - - /* Pointer to mmap'ed areas for this process. Set up by fork. */ - void *mmap_ptr; - - /* Used to spawn a child for fork(), among other things. */ - char progname[MAX_PATH]; - - #define PINFO_ZERO ((((pinfo *) NULL)->progname + 1) - ((char *) NULL)) - - /* Anything below this point is not zeroed automatically by allocate_pid */ - - /* The pid stays the same, while the hProcess moves due to execs. */ - pid_t pid; - /* Parent process id. */ - pid_t ppid; - - /* Various flags indicating the state of the process. See PID_ - constants below. */ - DWORD process_state; - - void record_death (int lock = 1); -}; - -#define ISSTATE(p, f) (!!((p)->process_state & f)) -#define NOTSTATE(p, f) (!((p)->process_state & f)) - -#define PSIZE 128 - -class pinfo_list -{ - public: - int next_pid; - pinfo vec[PSIZE]; - char lock_info[MAX_PATH + 1]; - pinfo * operator[] (pid_t x); - int size (void) { return PSIZE; } - pinfo *allocate_pid (void); - void init (void); -}; - -void __stdcall pinfo_init (PBYTE); -pinfo *__stdcall procinfo (int n); - enum { PROC_MAGIC = 0xaf08f000, @@ -221,7 +87,7 @@ void __stdcall init_child_info (DWORD, child_info *, int, HANDLE); extern child_info_fork *child_proc_info; /* Process info for this process */ -extern pinfo *myself; +extern pinfo myself; /* non-NULL if this process is a child of a cygwin process */ extern HANDLE parent_alive; @@ -499,8 +365,6 @@ class shared_info DWORD inited; public: - pinfo_list p; - /* FIXME: Doesn't work if more than one user on system. */ mount_info mount; -- cgit v1.2.3