newlib/winsup/cygwin/tty.cc

478 lines
10 KiB
C++
Raw Normal View History

2000-02-17 20:38:33 +01:00
/* tty.cc
Copyright 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
2000-02-17 20:38:33 +01:00
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. */
#include "winsup.h"
2000-02-17 20:38:33 +01:00
#include <unistd.h>
#include <utmp.h>
#include <wingdi.h>
#include <winuser.h>
#include <sys/cygwin.h>
#include "cygerrno.h"
#include "security.h"
Add "path.h" include throughout, where needed. Use new path_conv methods and operators to simplify testing for directory and attributes, throughout. * path.h (path_conv::exists): New method. (path_conv::has_attribute): Ditto. (path_conv::isdir): Ditto. (path_conv::DWORD &): New operator. (path_conv::int &): Ditto. * dir.cc (rmdir): Eliminate a goto. * dtable.cc (dtable::build_fhandler): Accept opt and suffix info for path_conv.check. Return fh == NULL on path_conv error. Pass unit to set_name as appropriate. (dtable::reset_unix_path_name): New method. * dtable.h (dtable): Declare new method. Reflect arg changes to build_fhandler. * fhandler.cc (fhandler_disk_dummy_name): Eliminate. (fhandler_base::set_name): Expect paths to be NULL. Build unix_path_name from win32_path_name when it is a device. (fhandler_base::reset_unix_path_name): New method. (fhandler_base::raw_read): Report EISDIR when ERROR_INVALID_FUNCTION or ERROR_INVALID_PARAMETER and reading a directory. (fhandler_disk_file::fstat): Don't call stat_dev since we should now never be calling fhandler_disk_file methods with devices. (fhandler_base::fhandler_base): Clear {unix,win32}_path_name. (fhandler_base::~fhandler_base): Always free {unix,win32}_path_name. (fhandler_disk_file::fhandler_disk_file): Remove set_no_free_names kludge. (fhandler_disk_file::open): Ditto. * fhandler.h (fhandler_base::no_free_names): Eliminate. (fhandler_base::set_no_free_names): Ditto. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Don't set unix_path_name here. * path.cc (fchdir): Lock fd table throughout. Use new dtable::reset_unix_path_name method to reset path. * syscalls.cc (stat_worker): Reorganize to always call fstat method. Pass path_conv method to fhandler_*::open. (chroot): Elminate a goto.
2001-10-01 06:10:07 +02:00
#include "path.h"
* devices.cc: New file. * devices.gperf: New file. * devices.shilka: New file. * cygwin-gperf: New file. * cygwin-shilka: New file. * fhandler_fifo.cc: New file. * fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes fhandler.h throughout. Remove device argument and unit arguments from fhandler constructors throughout. Remove pc arguments to fhandler functions and use internal pc element instead, throughout. Use dev element in pc throughout. Use major/minor elements rather than units and device numbers previously in fhandler class. Use correct methods for fhandler file names rather than directly accessing file name variables, throughout. * Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o * dcrt0.cc (dll_crt0_1): Call device::init. * devices.h: Renumber devices based on more Linux-like major/minor numbers. Add more devices. Declare standard device storage. (device): Declare struct. * dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type. * dtable.cc (dtable::get_debugger_info): Ditto. (cygwin_attach_handle_to_fd): Ditto. (dtable::release): Remove special FH_SOCKET case in favor of generic "need_fixup_before" test. (dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name to build standard fhandler. (dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move out of dtable class. Don't accept a path_conv argument. Just build it here and pass it to: (build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class. Use intrinsic device type in path_conv to create new fhandler. (build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class. Simplify arguments to just take new 'device' type and a name. Just return pointer to fhandler rather than trying to insert into dtable. (dtable::dup_worker): Accommodate above build_fh name changes. (dtable::find_fifo): New (currently broken) function. (handle_to_fn): Use strechr for efficiency. * dtable.h: Reflect above build_fh name changes and argument differences. (fhandler_base *&operator []): Return self rather than copy of self. * fhandler.cc (fhandler_base::operator =): Use pc element to set normalized path. (fhandler_base::set_name): Ditto. (fhandler_base::raw_read): Use method to access name. (fhandler_base::write): Correctly use get_output_handle rather than get_handle. (handler_base::device_access_denied): New function. (fhandler_base::open): Eliminate pc argument and use pc element of fhandler_base throughout. (fhandler_base::fstat): Detect if device is based in filesystem and use fstat_fs to calculate stat, if so. (fhandler_base::fhandler_base): Eliminate handling of file names and, instead, just free appropriate component from pc. (fhandler_base::opendir): Remove path_conv parameter. * fhandler.h: Remove all device flags. (fhandler_base::pc): New element. (fhandler_base::set_name): Change argument to path_conv. (fhandler_base::error): New function. (fhandler_base::exists): New function. (fhandler_base::pc_binmode): New function. (fhandler_base::dev): New function. (fhandler_base::open_fs): New function. (fhandler_base::fstat_fs): New function. (fhandler_base::fstat_by_name): New function. (fhandler_base::fstat_by_handle): New function. (fhandler_base::isfifo): New function. (fhandler_base::is_slow): New function. (fhandler_base::is_auto_device): New function. (fhandler_base::is_fs_special): New function. (fhandler_base::device_access_denied): New function. (fhandler_base::operator DWORD&): New operator. (fhandler_base::get_name): Return normalized path from pc. (fhandler_base::get_win32_name): Return windows path from pc. (fhandler_base::isdevice): Renamed from is_device. (fhandler_base::get_native_name): Return device format. (fhandler_fifo): New class. (fhandler_nodevice): New class. (select_stuff::device_specific): Remove array. (select_stuff::device_specific_pipe): New class element. (select_stuff::device_specific_socket): New class element. (select_stuff::device_specific_serial): New class element. (select_stuff::select_stuff): Initialize new elements. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class from fhandler_disk_file. (fhandler_base::fstat_by_name): Ditto. (fhandler_base::fstat_by_name): Ditto. (fhandler_disk_file::open): Move most functionality into fhandler_base::open_fs. (fhandler_base::open_fs): New function. (fhandler_disk_file::close): Move most functionality into fhandler_base::close_fs. (fhandler_base::close_fs): New function. * fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging output. * fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard urandom device into appropriate place. (fhandler_socket::accept): Reflect change in fdsock return value. * fhandler_tty.cc: See "throughouts" above. * net.cc: Accommodate fdsock change throughout. (fdsock): Return success or failure, accept fd argument and device argument. * path.cc (symlink_info::major): New element. (symlink_info::minor): New element. (symlink_info::parse_device): Declare new function. (fs_info::update): Accommodate changes in path_conv class. (path_conv::fillin): Ditto. (path_conv::return_and_clear_normalized_path): Eliminate. (path_conv::set_normalized_path): New function. (path_conv::path_conv): Set info in dev element. Use path_conv methods Check for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff. where appropriate rather than direct access. Use set_normalized_path to set normalized path. (windows_device_names): Eliminate. (get_dev): Ditto. (get_raw_device_number): Ditto. (get_device_number): Ditto. (win32_device_name): Call new device name parser to do most of the heavy lifting. (mount_info::conv_to_win32_path): Fill in dev field as appropriate. (symlink_worker): Handle new device files. (symlink_info::check): Ditto. (symlink_info::parse_device): Define new function. * path.h (executable_states): Move here from fhandler.h. (fs_info): Rename variables to *_storage and create methods for accessing same. (path_conv): Add dev element, remove devn and unit and adjust inline methods to accommodate. (set_normalized_path): Declare new function. * pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos. (_pinfo::commune_send): Ditto. * pipe.cc (fhandler_pipe::close): check for existence of handle before closing it. (handler_pipe::create): Rename from make_pipe. Change arguments to accept fhandler_pipe array. Accommodate fifos. (pipe): Rework to deal with fhandler_pipe::create changes. (_pipe): Ditto. * select.cc: Use individual device_specific types throughout rather than indexing with obsolete device number. (set_bits): Use is_socket call rather than checking device number. * shared_info.h (CURR_MOUNT_MAGIC): Update. (conv_to_win32_path): Reflect addition of device argument. * syscalls.cc (mknod_worker): New function. (open): Use build_fh_name to build fhandler. (chown_worker): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (chmod_device): New function. (chmod): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. Use chmod_device to set mode of in-filesystem devices. (stat_worker): Eliminate path_conv argument. Call build_fh_name to construct fhandler. Use fh->error() rather than pc->error to detect errors in fhandler construction. (access_worker): New function pulled from access. Accommodate in-filesystem devices. (access): Use access_worker. (fpathconf): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (mknod_worker): New function. (mknod32): New function. (chroot): Free normalized path -- assuming it was actually cmalloced. * tty.cc (create_tty_master): Tweak for new device class. (tty::common_init): Ditto. * winsup.h (stat_worker): Remove. (symlink_worker): Declare. * exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't worry about pending_signals since sig_dispatch_pending should always do the right thing now. (sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3. * pinfo.h: Move __SIG enum to sigproc.h. (PICOM_FIFO): New enum element. (_pinfo): Remove 'thread2signal' stuff throughout class. (_pinfo::commune_send): Make varargs. (_pinfo::sigtodo): Eliminate. (_pinfo::thread2signal): Ditto. * signal.cc (kill_worker): Eliminate call to setthread2signal. * sigproc.cc (local_sigtodo): Eliminate. (getlocal_sigtodo): Ditto. (sigelem): New class. (pending_signals): New class. (sigqueue): New variable, start of sigqueue linked list. (sigcatch_nonmain): Eliminate. (sigcatch_main): Eliminate. (sigcatch_nosync): Eliminate. (sigcomplete_nonmain): Eliminate. (pending_signals): Eliminate. (sig_clear): Call signal thread to clear pending signals, unless already in signal thread. (sigpending): Call signal thread to get pending signals. (sig_dispatch_pending): Eliminate use of pending_signals and just check sigqueue. (sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close signal pipe handle. (sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send signals. (getevent): Eliminate. (pending_signals::add): New function. (pending_signals::del): New function. (pending_signals::next): New function. (wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to communicate and maintain a linked list of signals. * sigproc.h: Move __SIG defines here. Add __SIGPENDING. (sig_dispatch_pending): Remove "C" specifier. (sig_handle): Accept a mask argument. * thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
#include "fhandler.h"
#include "dtable.h"
#include "cygheap.h"
#include "pinfo.h"
2002-02-28 Robert Collins <rbtcollins@hotmail.com> * Merged cygwin_daemon into head minus the new shm and ipc exports. 2002-02-28 Robert Collins <rbtcollins@hotmail.com> * fhandler_tty.cc (fhandler_tty_slave::open): More debugging. (fhandler_tty_slave::read): Fix printf type for the handle. * tty.cc (tty::common_init): Add a FIXME for security. 2002-01-29 Robert Collins <rbtcollins@hotmail.com> * Makefile.in (OBJS): Remove duplicate localtime.o. 2002-01-17 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (check_and_dup_handle): Consolidate the two variants for simplicity. Add Some basic debug output. (client_request_attach_tty::serve): Use the new debug_printf for clarity. Mark the duplicated handles as inheritable - fixup_after_fork() doesn't reopen tty's. 2002-01-16 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (transport): Correct scope. (client_request_attach_tty::serve): Add more debug information. Fix erroneous use of transport instead of conn. * cygserver_transport_pipes.cc (transport_layer_pipes::close): More debug. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::impersonate_client): Ditto. Mon Oct 8 7:41:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (server_request::process): Rename client_request_shm_get to client_request_shm. * cygserver_process.cc (process_cache::add): Rename to add_task. Use process_cleanup instead of process_request. (process_cache::remove_process): New method. (process::process): Initialize new members. (process::~process): New member. (process::cleanup): New method. (process::add_cleanup_routine): New method. (process_request::process): Rename to process_cleanup. Call the process object's cleanup method and then delete it. (process_process_param::request_loop): Remove the signalling process. * cygserver_shm.cc: Globally rename client_request_shm_get to client_request_shm. (client_request_shm_get::serve): Handle attach request counting. * cygserver_shm.h: Globally rename client_request_shm_get to client_request_shm. (class shm_cleanup): New class. * shm.cc: Globally rename client_request_shm_get to client_request_shm. (client_request_shm::client_request_shm): New constructor for attach requests. (shmat): Use it. * include/cygwin/cygserver_process.h (class process_request): Rename to process_cleanup. (class cleanup_routine): New class. (class process): New members and methods to allow calling back when the process terminates. Thu Oct 4 14:12:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (request_loop): Make static. (main): Use new cache constructor syntax. Start cache worker threads. Cleanup the cache at shutdown. * cygserver_process.cc: Run indent. (process_cache::process_cache): Add a trigger to use when adding a process. (process_cache::process): Move process_entry to process. Insert at the end of the list. Trigger the request loop when new process's inserted. (process_cache::process_requests): Do it. (process_cache::add): New method. (process_cache::handle_snapshot): New method. (process::process): Merge in the process_entry fields. (process::handle): Make a stub function. (process::exit_code): New method. (process_request::process): New method. (process_process_param::request_loop): New method. * cygserver_shm.cc: New header dependency - threaded_queue.h. * threaded_queue.cc (threaded_queue::cleanup): Clearer messages. (queue_process_param::stop): Short spinlock on interruptible threads. * threaded_queue.h (class threaded_queue): New constructor. * include/cygwin/cygserver_process.h (process_request): New class. (process_entry): Remove. (process): Merge in process_entry. (process_cache): Inherit from threaded_queue. Tue Oct 2 23:24:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (class server_process_param): Use new constructor syntax. * cygserver_process.cc (process_cache::~process_cache): New function. * threaded_queue.cc: Define condition debug_printf. Run indent. (threaded_queue::cleanup): Move queue_process_param guts to a method. (threaded_queue::process_requests): Ditto. (queue_process_param::queue_process_param): New method. (queue_process_param::~queue_process_param): Ditto. (queue_process_param::start): Ditto. (queue_process_param::stop): Ditto. * threaded_queue.h (class queue_process_param): Add support for interruptible request loops. * cygwin/include/cygwin/cygserver_process.h (class process_cache): Add destructor. Tue Oct 2 23:24:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver_client.cc: New flag allow_daemon to disable the daemon completely. (cygserver_request): Check it. (cygserver_init): Ditto. * environ.cc (parse_thing): Add (no)daemon option. Tue Oct 2 23:00:00 2001 Robert Collins <rbtcollins@hotmail.com> * shm.cc: Update to handle include changes from HEAD. Tue Oct 2 16:06:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Remove cygserver_shm.o from cygwin1.dll. Rename cygserver_shm_outside.o to cygserver_shm.o. * cygserver.cc (server_request::process): Use the new client_request constructor. * cygserver_client.cc: Remove the #ifdef's stubs for the server method within cygwin. (client_request_attach_tty::client_request_attach_tty): Use the new client_request constructor. (client_request_shutdown::client_request_shutdown): Ditto. (client_request::client_request): Ditto. * cygserver_shm.cc (client_request_shm_get::serve): Remove the #ifdef'd stub for in-cygwin builds. (client_request_shm_get::client_request_shm_get): Use the new client_request constructor, and remove the in-cygwin variants. * cygserver_shm.h (class client_request_shm_get): #ifndef test the serve method - it's only used in cygserver. * shm.cc (client_request_shm_get::client_request_shm_get): New function. * include/cygwin/cygserver.h (request_header): New constructor. (class client_request): Use it. New constructor accepting the header size. #ifndef test the server method - it's only used within cygserver. (client_request_get_version): #ifdef test the server method. (client_request_shutdown): Ditto. (client_request_attach_tty): Ditto. Tue Oct 2 9:57:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: add threaded_queue.o to cygserver.exe. * cygserver.cc: Include threaded_queue.h (class server_request): Inherit from queue_request. (class server_process_param): Inherit from queue_process_param. (class server_request_queue): Inherit from threaded_queue. (request_loop): Adjust for new types. (server_request_queue::process_requests): Remove guts to threaded_queue::process_requests. (server_request::server_request): Adjust for new types. (worker_function): Delete. (server_request_queue::create_workers): Delete. (server_request_queue::cleanup): Delete. (server_request_queue::add): Move guts to threaded_queue::add. * threaded_queue.cc: New file. * threaded_queue.h: New file. Mon Oct 1 12:38:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (client_request::serve): New function. * cygserver_process.cc: Inlude <pthread.h> for pthread_once. (process_cache::process_cache): Initialise a crtiical section for write access. (process_cache::process): Use the critical section. Also add missing entries to the cache. (do_process_init): New function to initalise class process static variables. (process::process): Ensure that the process access critical section is initialised. (process::handle): Close the handle of old process's when they have terminated and we are returning the handle for a process with the same pid. * cygserver_shm.cc: Run indent. Include cygserver_process.h to allow process cache functionality. (client_request_shm_get::serve): New parameter for process cache support. Use the process cache, not OpenProcess to get a handle to the originating process. Fix a handle leak with token_handle. * cygserver_shm.h (class client_request_shm_get): Update ::serve for process cache support. * cygserver_transport_pipes.cc: Redefine debug_printf to be conditional on DEBUG. * include/cygwin/cygserver.h: Do not implement client_request::serve in the header. * include/cygwin/cygserver_process.h (class process_cache): Add a write access critical section to prevent races when requests from a multithreaded application arrive. Sun Sep 30 23:41:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Add cygserver_process.o to cygserver.exe. * cygserver.cc: Include signal.h and cygwin_version.h. Define debug_printf as a macro. Define DEBUG to a value. (client_request_attach_tty::serve): Add beginning of process cache support. Change from #ifdef DEBUG to work with new DEBUG style. (client_request_get_version::serve): Add beginning of process cache support. (class server_request): New prototype for support of process cache. (class queue_process_param): New class to allow request loop threading. (class server_request_queue): Add beginning of process cache support. Allow request loop threading. (request_loop): Thread function for request loops. (server_request_queue::process_requests): Initiator for threaded request loops. (client_request_shutdown::serve): Add beginning of process cache support. (server_request::server_request): Ditto. (server_request::process): Use debug_printf. Add beginning of process cache support. (server_request_queue::cleanup): Kill off any request loop threads. (server_request_queue::add): Add beginning of process cache support. (handle_signal): Trigger a shutdown. (main): Print out some useful info at startup - version, date time. Add process cache support. Spawn a separate thread for the transport request loop, thus allowing concurrent support for multiple transports. * cygserver_client.cc (client_request_get_version::serve): Add process cache support. (client_request_attach_tty::serve): Add process cache support. (client_request_shutdown::serve): Add process cache support. * cygsserver_process.cc: New file with the process cache support. * cygserver_shm.cc: Redefine debug_printf to allow conditional output. * cygwin.din: Export shmdt(). * shm.cc: Run indent. Update FIXME's. (shmdt): New function. * include/cygwin/cygserver.h (class client_request): Add process cache support. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. * include/cygwin/cygserver_process.h: New header for process cache support. Sun Sep 30 8:52:00 2001 Robert Collins <rbtcollins@hotmail.com> * include/cygwin/cygserver_transport.h: Add copyright header. * include/cygwin/cygserver_transport_pipes.h: Ditto. * include/cygwin/cygserver_transport_sockets.h: Ditto. Sat Sep 29 20:40:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Add cygserver_transport_sockets.o to DLL_OFILES. Add cygserver_transport_sockets_outside.o to cygserver.exe. * cygserver.cc: Include new include files. * cygserver_client.cc: Ditto. * cygserver_shm.h: No need to include <sys/socket.h> now. * cygerver_transport.cc: Include new include files. (transport_layer_base::transport_layer_base): Strip back to a stub. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport_pipes.cc: Include new header "cygwin/cygserver_transport_pipes.h". * cygserver_transport_sockets.cc: New file. * dcrt0.cc: No need to include <sys/socket.h> now. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. * include/cygwin/cygserver_transport.h: Strip the base class to a stub. Remove the cygserver_transport_pipes class. * include/cygwin/cygserver_transport_pipes.h: New file. * include/cygwin/cygserver_transport_sockets.h: New file. Tue Sep 25 16:22:00 2001 Robert Collins <rbtcollins@hotmail.com> * autoload.cc: Add dynamic load statement for 'ImpersonateNamedPipeClient'. * Makefile.in: Add new object files, and build instructions for cygserver.exe. * cygwin.din: Export ftok, shmat, shmctl and shmget. * dcrt0.cc: Additional includes for cygserver support. (dll_crt0_1): Initialise the cygserver client. * fhandler.h (fhandler_tty): New method cygserver_attach_tty. * fhandler_tty.cc: Additional includes for cygserver support. (fhandler_tty_slave::open): Attempt to use the cygserver when obtaining handles from the parent process. On failure or 9x use the current method. (fhandler_tty_slave::cygserver_attach_tty): New function. * fork.cc (fork_child): Fixup shm memory mapped areas. * pinfo.h: Declare fixup_shms_after_fork(). * security.h: Declare alloc_sd(). * tty.cc: Additonal includes to support cygserver. (tty::common_init): Don't allow others to open us if the cygserver is running. * winsup.h: Declare cygserver_running. * cygserver.cc: New file. * cygserver_client.cc: New file. * cygserver_shm.cc: New file. * cygserver_shm.h: New file. * cygserver_transport.cc: New file. * cygserver_transport_pipes.cc: New file. * ipc.cc: New file. * shm.cc: New file. * include/cygwin/cygserver.h: New file. * include/cygwin/cygserver_transport.h: New file. * include/sys/ipc.h: New file. * include/sys/shm.h: New file. 2002-02-28 Robert Collins <rbtcollins@hotmail.com> * thread.cc (semaphore::TryWait): Set errno as required by posix 1003.1. (__sem_wait): Ditto. (__sem_trywait): Ditto.
2002-02-28 15:30:38 +01:00
#include "cygwin/cygserver.h"
#include "shared_info.h"
#include "cygthread.h"
2000-02-17 20:38:33 +01:00
extern fhandler_tty_master *tty_master;
extern "C" int
grantpt (int fd)
2000-02-17 20:38:33 +01:00
{
return 0;
}
extern "C" int
unlockpt (int fd)
2000-02-17 20:38:33 +01:00
{
return 0;
}
extern "C" int
revoke (char *ttyname)
{
set_errno (ENOSYS);
return -1;
}
extern "C" int
2000-02-17 20:38:33 +01:00
ttyslot (void)
{
if (NOTSTATE (myself, PID_USETTY))
return -1;
return myself->ctty;
}
void __stdcall
tty_init (void)
{
* sync.h (new_muto): Just accept an argument which denotes the name of the muto. Use this argument to construct static storage. * cygheap.cc (cygheap_init): Reflect above change. * exceptions.cc (events_init): Ditto. * malloc.cc (malloc_init): Ditto. * path.cc (cwdstuff::init): Ditto. * cygheap.h (cwdstuff): Change name of lock element to make it less generic. * path.cc (cwdstuff::get_hash): Ditto. (cwdstuff::get_initial): Ditto. (cwdstuff::set): Ditto. (cwdstuff::get): Ditto. * sigproc.cc (proc_subproc): Ditto. * debug.cc (lock_debug): Change to method. Use method rather than macro throughout. * tty.h (tty_min::kill_pgrp): Declare new method. * fhandler_termios.cc (tty_min::kill_pgrp): New method. (fhandler_termios::line_edit): Use new method for killing process. * dcrt0.cc (do_exit): Ditto. * dtable.cc (dtable::get_debugger_info): New method for inheriting dtable info from a debugger. * tty.cc (tty_init): Attempt to grab file handle info from parent debugger, if appropriate. # dtable.cc (dtable::stdio_init): Make this a method. (dtable::init_std_file_from_handle): Don't set fd unless it's not open. (dtable::build_fhandler_from_name): Move name setting to dtable::build_fhandler. (dtable::build_fhandler): Add win32 name parameter. * dcrt0.cc (dll_crt0_1): Change to use dtable stdio_init. * dtable.h (dtable): Reflect build_fhandler parameter change. * mmap.cc (mmap_record::alloc_fh): Don't set name parameter in build_fhandler. * net.cc (fdsock): Remove set_name call since it is now handled by build_fhandler. * sigproc.cc (proc_subproc): Release muto as early as possible.
2002-02-22 20:33:41 +01:00
if (!myself->ppid_handle && NOTSTATE (myself, PID_CYGPARENT))
cygheap->fdtab.get_debugger_info ();
2000-02-17 20:38:33 +01:00
if (NOTSTATE (myself, PID_USETTY))
return;
if (myself->ctty == -1)
if (NOTSTATE (myself, PID_CYGPARENT))
myself->ctty = attach_tty (myself->ctty);
else
return;
if (myself->ctty == -1)
termios_printf ("Can't attach to tty");
}
/* Create session's master tty */
void __stdcall
create_tty_master (int ttynum)
{
* devices.cc: New file. * devices.gperf: New file. * devices.shilka: New file. * cygwin-gperf: New file. * cygwin-shilka: New file. * fhandler_fifo.cc: New file. * fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes fhandler.h throughout. Remove device argument and unit arguments from fhandler constructors throughout. Remove pc arguments to fhandler functions and use internal pc element instead, throughout. Use dev element in pc throughout. Use major/minor elements rather than units and device numbers previously in fhandler class. Use correct methods for fhandler file names rather than directly accessing file name variables, throughout. * Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o * dcrt0.cc (dll_crt0_1): Call device::init. * devices.h: Renumber devices based on more Linux-like major/minor numbers. Add more devices. Declare standard device storage. (device): Declare struct. * dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type. * dtable.cc (dtable::get_debugger_info): Ditto. (cygwin_attach_handle_to_fd): Ditto. (dtable::release): Remove special FH_SOCKET case in favor of generic "need_fixup_before" test. (dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name to build standard fhandler. (dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move out of dtable class. Don't accept a path_conv argument. Just build it here and pass it to: (build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class. Use intrinsic device type in path_conv to create new fhandler. (build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class. Simplify arguments to just take new 'device' type and a name. Just return pointer to fhandler rather than trying to insert into dtable. (dtable::dup_worker): Accommodate above build_fh name changes. (dtable::find_fifo): New (currently broken) function. (handle_to_fn): Use strechr for efficiency. * dtable.h: Reflect above build_fh name changes and argument differences. (fhandler_base *&operator []): Return self rather than copy of self. * fhandler.cc (fhandler_base::operator =): Use pc element to set normalized path. (fhandler_base::set_name): Ditto. (fhandler_base::raw_read): Use method to access name. (fhandler_base::write): Correctly use get_output_handle rather than get_handle. (handler_base::device_access_denied): New function. (fhandler_base::open): Eliminate pc argument and use pc element of fhandler_base throughout. (fhandler_base::fstat): Detect if device is based in filesystem and use fstat_fs to calculate stat, if so. (fhandler_base::fhandler_base): Eliminate handling of file names and, instead, just free appropriate component from pc. (fhandler_base::opendir): Remove path_conv parameter. * fhandler.h: Remove all device flags. (fhandler_base::pc): New element. (fhandler_base::set_name): Change argument to path_conv. (fhandler_base::error): New function. (fhandler_base::exists): New function. (fhandler_base::pc_binmode): New function. (fhandler_base::dev): New function. (fhandler_base::open_fs): New function. (fhandler_base::fstat_fs): New function. (fhandler_base::fstat_by_name): New function. (fhandler_base::fstat_by_handle): New function. (fhandler_base::isfifo): New function. (fhandler_base::is_slow): New function. (fhandler_base::is_auto_device): New function. (fhandler_base::is_fs_special): New function. (fhandler_base::device_access_denied): New function. (fhandler_base::operator DWORD&): New operator. (fhandler_base::get_name): Return normalized path from pc. (fhandler_base::get_win32_name): Return windows path from pc. (fhandler_base::isdevice): Renamed from is_device. (fhandler_base::get_native_name): Return device format. (fhandler_fifo): New class. (fhandler_nodevice): New class. (select_stuff::device_specific): Remove array. (select_stuff::device_specific_pipe): New class element. (select_stuff::device_specific_socket): New class element. (select_stuff::device_specific_serial): New class element. (select_stuff::select_stuff): Initialize new elements. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class from fhandler_disk_file. (fhandler_base::fstat_by_name): Ditto. (fhandler_base::fstat_by_name): Ditto. (fhandler_disk_file::open): Move most functionality into fhandler_base::open_fs. (fhandler_base::open_fs): New function. (fhandler_disk_file::close): Move most functionality into fhandler_base::close_fs. (fhandler_base::close_fs): New function. * fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging output. * fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard urandom device into appropriate place. (fhandler_socket::accept): Reflect change in fdsock return value. * fhandler_tty.cc: See "throughouts" above. * net.cc: Accommodate fdsock change throughout. (fdsock): Return success or failure, accept fd argument and device argument. * path.cc (symlink_info::major): New element. (symlink_info::minor): New element. (symlink_info::parse_device): Declare new function. (fs_info::update): Accommodate changes in path_conv class. (path_conv::fillin): Ditto. (path_conv::return_and_clear_normalized_path): Eliminate. (path_conv::set_normalized_path): New function. (path_conv::path_conv): Set info in dev element. Use path_conv methods Check for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff. where appropriate rather than direct access. Use set_normalized_path to set normalized path. (windows_device_names): Eliminate. (get_dev): Ditto. (get_raw_device_number): Ditto. (get_device_number): Ditto. (win32_device_name): Call new device name parser to do most of the heavy lifting. (mount_info::conv_to_win32_path): Fill in dev field as appropriate. (symlink_worker): Handle new device files. (symlink_info::check): Ditto. (symlink_info::parse_device): Define new function. * path.h (executable_states): Move here from fhandler.h. (fs_info): Rename variables to *_storage and create methods for accessing same. (path_conv): Add dev element, remove devn and unit and adjust inline methods to accommodate. (set_normalized_path): Declare new function. * pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos. (_pinfo::commune_send): Ditto. * pipe.cc (fhandler_pipe::close): check for existence of handle before closing it. (handler_pipe::create): Rename from make_pipe. Change arguments to accept fhandler_pipe array. Accommodate fifos. (pipe): Rework to deal with fhandler_pipe::create changes. (_pipe): Ditto. * select.cc: Use individual device_specific types throughout rather than indexing with obsolete device number. (set_bits): Use is_socket call rather than checking device number. * shared_info.h (CURR_MOUNT_MAGIC): Update. (conv_to_win32_path): Reflect addition of device argument. * syscalls.cc (mknod_worker): New function. (open): Use build_fh_name to build fhandler. (chown_worker): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (chmod_device): New function. (chmod): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. Use chmod_device to set mode of in-filesystem devices. (stat_worker): Eliminate path_conv argument. Call build_fh_name to construct fhandler. Use fh->error() rather than pc->error to detect errors in fhandler construction. (access_worker): New function pulled from access. Accommodate in-filesystem devices. (access): Use access_worker. (fpathconf): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (mknod_worker): New function. (mknod32): New function. (chroot): Free normalized path -- assuming it was actually cmalloced. * tty.cc (create_tty_master): Tweak for new device class. (tty::common_init): Ditto. * winsup.h (stat_worker): Remove. (symlink_worker): Declare. * exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't worry about pending_signals since sig_dispatch_pending should always do the right thing now. (sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3. * pinfo.h: Move __SIG enum to sigproc.h. (PICOM_FIFO): New enum element. (_pinfo): Remove 'thread2signal' stuff throughout class. (_pinfo::commune_send): Make varargs. (_pinfo::sigtodo): Eliminate. (_pinfo::thread2signal): Ditto. * signal.cc (kill_worker): Eliminate call to setthread2signal. * sigproc.cc (local_sigtodo): Eliminate. (getlocal_sigtodo): Ditto. (sigelem): New class. (pending_signals): New class. (sigqueue): New variable, start of sigqueue linked list. (sigcatch_nonmain): Eliminate. (sigcatch_main): Eliminate. (sigcatch_nosync): Eliminate. (sigcomplete_nonmain): Eliminate. (pending_signals): Eliminate. (sig_clear): Call signal thread to clear pending signals, unless already in signal thread. (sigpending): Call signal thread to get pending signals. (sig_dispatch_pending): Eliminate use of pending_signals and just check sigqueue. (sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close signal pipe handle. (sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send signals. (getevent): Eliminate. (pending_signals::add): New function. (pending_signals::del): New function. (pending_signals::next): New function. (wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to communicate and maintain a linked list of signals. * sigproc.h: Move __SIG defines here. Add __SIGPENDING. (sig_dispatch_pending): Remove "C" specifier. (sig_handle): Accept a mask argument. * thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
device ttym = *ttym_dev;
ttym.setunit (ttynum); /* CGF FIXME device */
tty_master = (fhandler_tty_master *) build_fh_dev (ttym);
if (tty_master->init ())
2000-02-17 20:38:33 +01:00
api_fatal ("Can't create master tty");
else
{
/* Log utmp entry */
struct utmp our_utmp;
DWORD len = sizeof our_utmp.ut_host;
2000-02-17 20:38:33 +01:00
bzero ((char *) &our_utmp, sizeof (utmp));
(void) time (&our_utmp.ut_time);
strncpy (our_utmp.ut_name, getlogin (), sizeof (our_utmp.ut_name));
GetComputerName (our_utmp.ut_host, &len);
2000-02-17 20:38:33 +01:00
__small_sprintf (our_utmp.ut_line, "tty%d", ttynum);
if ((len = strlen (our_utmp.ut_line)) >= UT_IDLEN)
len -= UT_IDLEN;
else
len = 0;
strncpy (our_utmp.ut_id, our_utmp.ut_line + len, UT_IDLEN);
2000-02-17 20:38:33 +01:00
our_utmp.ut_type = USER_PROCESS;
our_utmp.ut_pid = myself->pid;
2000-02-17 20:38:33 +01:00
myself->ctty = ttynum;
login (&our_utmp);
}
}
void __stdcall
tty_terminate (void)
{
if (NOTSTATE (myself, PID_USETTY))
return;
cygwin_shared->tty.terminate ();
}
int __stdcall
attach_tty (int num)
{
if (num != -1)
{
return cygwin_shared->tty.connect_tty (num);
}
if (NOTSTATE (myself, PID_USETTY))
return -1;
return cygwin_shared->tty.allocate_tty (1);
}
void
tty_list::terminate (void)
{
int ttynum = myself->ctty;
/* Keep master running till there are connected clients */
if (ttynum != -1 && ttys[ttynum].master_pid == GetCurrentProcessId ())
{
tty *t = ttys + ttynum;
CloseHandle (t->from_master);
CloseHandle (t->to_master);
/* Wait for children which rely on tty handling in this process to
go away */
for (int i = 0; ; i++)
{
if (!t->slave_alive ())
break;
if (i >= 100)
{
small_printf ("waiting for children using tty%d to terminate\n",
ttynum);
i = 0;
}
low_priority_sleep (200);
2000-02-17 20:38:33 +01:00
}
termios_printf ("tty %d master about to finish", ttynum);
ForceCloseHandle1 (t->to_slave, to_pty);
ForceCloseHandle1 (t->from_slave, from_pty);
CloseHandle (tty_master->inuse);
2000-02-17 20:38:33 +01:00
t->init ();
char buf[20];
__small_sprintf (buf, "tty%d", ttynum);
logout (buf);
}
}
int
tty_list::connect_tty (int ttynum)
{
if (ttynum < 0 || ttynum >= NTTYS)
{
termios_printf ("ttynum (%d) out of range", ttynum);
return -1;
}
if (!ttys[ttynum].exists ())
{
termios_printf ("tty %d was not allocated", ttynum);
return -1;
}
return ttynum;
}
void
tty_list::init (void)
{
for (int i = 0; i < NTTYS; i++)
{
ttys[i].init ();
ttys[i].setntty (i);
}
}
/* Search for tty class for our console. Allocate new tty if our process is
the only cygwin process in the current console.
Return tty number or -1 if error.
If flag == 0, just find a free tty.
*/
int
tty_list::allocate_tty (int with_console)
{
HWND console;
/* FIXME: This whole function needs a protective mutex. */
if (!with_console)
console = NULL;
else if (!(console = GetConsoleWindow ()))
2000-02-17 20:38:33 +01:00
{
char *oldtitle = new char [TITLESIZE];
if (!oldtitle)
{
termios_printf ("Can't *allocate console title buffer");
return -1;
}
if (!GetConsoleTitle (oldtitle, TITLESIZE))
{
termios_printf ("Can't read console title");
return -1;
}
if (WaitForSingleObject (title_mutex, INFINITE) == WAIT_FAILED)
termios_printf ("WFSO for title_mutext %p failed, %E", title_mutex);
char buf[40];
__small_sprintf (buf, "cygwin.find.console.%d", myself->pid);
SetConsoleTitle (buf);
for (int times = 0; times < 25; times++)
2002-09-30 17:17:44 +02:00
{
Sleep (10);
2002-09-30 17:17:44 +02:00
if ((console = FindWindow (NULL, buf)))
break;
2002-09-30 17:17:44 +02:00
}
2000-02-17 20:38:33 +01:00
SetConsoleTitle (oldtitle);
Sleep (40);
2000-02-17 20:38:33 +01:00
ReleaseMutex (title_mutex);
if (console == NULL)
{
termios_printf ("Can't find console window");
return -1;
}
}
/* Is a tty allocated for console? */
int freetty = -1;
for (int i = 0; i < NTTYS; i++)
{
if (!ttys[i].exists ())
{
if (freetty < 0) /* Scanning? */
freetty = i; /* Yes. */
if (!with_console) /* Do we want to attach this to a console? */
break; /* No. We've got one. */
}
if (with_console && ttys[i].gethwnd () == console)
{
termios_printf ("console %x already associated with tty%d",
console, i);
/* Is the master alive? */
HANDLE hMaster;
hMaster = OpenProcess (PROCESS_DUP_HANDLE, FALSE, ttys[i].master_pid);
if (hMaster)
{
CloseHandle (hMaster);
return i;
}
/* Master is dead */
freetty = i;
break;
}
}
/* There is no tty allocated to console, allocate the first free found */
if (freetty == -1)
{
system_printf ("No free ttys available");
return -1;
}
tty *t = ttys + freetty;
t->init ();
t->setsid (-1);
t->setpgid (myself->pgid);
t->sethwnd (console);
if (with_console)
{
termios_printf ("console %x associated with tty%d", console, freetty);
create_tty_master (freetty);
}
else
termios_printf ("tty%d allocated", freetty);
return freetty;
}
BOOL
tty::slave_alive ()
{
return alive (TTY_SLAVE_ALIVE);
}
BOOL
tty::master_alive ()
{
return alive (TTY_MASTER_ALIVE);
}
BOOL
tty::alive (const char *fmt)
{
HANDLE ev;
char buf[sizeof (TTY_MASTER_ALIVE) + 16];
__small_sprintf (buf, fmt, ntty);
if ((ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, buf)))
2000-02-17 20:38:33 +01:00
CloseHandle (ev);
return ev != NULL;
}
HANDLE
tty::create_inuse (const char *fmt)
2000-02-17 20:38:33 +01:00
{
HANDLE h;
char buf[sizeof (TTY_MASTER_ALIVE) + 16];
__small_sprintf (buf, fmt, ntty);
h = CreateEvent (&sec_all, TRUE, FALSE, buf);
2000-02-17 20:38:33 +01:00
termios_printf ("%s = %p", buf, h);
if (!h)
termios_printf ("couldn't open inuse event, %E", buf);
return h;
}
void
tty::init (void)
{
output_stopped = 0;
2000-02-17 20:38:33 +01:00
setsid (0);
pgid = 0;
hwnd = NULL;
to_slave = NULL;
from_slave = NULL;
was_opened = 0;
}
HANDLE
tty::get_event (const char *fmt, BOOL manual_reset)
2000-02-17 20:38:33 +01:00
{
HANDLE hev;
char buf[40];
__small_sprintf (buf, fmt, ntty);
if (!(hev = CreateEvent (&sec_all, manual_reset, FALSE, buf)))
2000-02-17 20:38:33 +01:00
{
termios_printf ("couldn't create %s", buf);
set_errno (ENOENT); /* FIXME this can't be the right errno */
return NULL;
}
termios_printf ("created event %s", buf);
return hev;
}
int
tty::make_pipes (fhandler_pty_master *ptym)
{
/* Create communication pipes */
/* FIXME: should this be sec_none_nih? */
if (CreatePipe (&from_master, &to_slave, &sec_all, 128 * 1024) == FALSE)
2000-02-17 20:38:33 +01:00
{
termios_printf ("can't create input pipe");
set_errno (ENOENT);
return FALSE;
}
// ProtectHandle1INH (to_slave, to_pty);
if (CreatePipe (&from_slave, &to_master, &sec_all, 128 * 1024) == FALSE)
2000-02-17 20:38:33 +01:00
{
termios_printf ("can't create output pipe");
set_errno (ENOENT);
return FALSE;
}
// ProtectHandle1INH (from_slave, from_pty);
2000-02-17 20:38:33 +01:00
termios_printf ("tty%d from_slave %p, to_slave %p", ntty, from_slave,
to_slave);
DWORD pipe_mode = PIPE_NOWAIT;
if (!SetNamedPipeHandleState (to_slave, &pipe_mode, NULL, NULL))
termios_printf ("can't set to_slave to non-blocking mode");
2000-02-17 20:38:33 +01:00
ptym->set_io_handle (from_slave);
ptym->set_output_handle (to_slave);
return TRUE;
}
BOOL
tty::common_init (fhandler_pty_master *ptym)
{
/* Set termios information. Force initialization. */
ptym->tcinit (this, TRUE);
if (!make_pipes (ptym))
return FALSE;
ptym->need_nl = 0;
2000-02-17 20:38:33 +01:00
/* Save our pid */
master_pid = GetCurrentProcessId ();
/* Allow the others to open us (for handle duplication) */
2002-02-28 Robert Collins <rbtcollins@hotmail.com> * Merged cygwin_daemon into head minus the new shm and ipc exports. 2002-02-28 Robert Collins <rbtcollins@hotmail.com> * fhandler_tty.cc (fhandler_tty_slave::open): More debugging. (fhandler_tty_slave::read): Fix printf type for the handle. * tty.cc (tty::common_init): Add a FIXME for security. 2002-01-29 Robert Collins <rbtcollins@hotmail.com> * Makefile.in (OBJS): Remove duplicate localtime.o. 2002-01-17 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (check_and_dup_handle): Consolidate the two variants for simplicity. Add Some basic debug output. (client_request_attach_tty::serve): Use the new debug_printf for clarity. Mark the duplicated handles as inheritable - fixup_after_fork() doesn't reopen tty's. 2002-01-16 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (transport): Correct scope. (client_request_attach_tty::serve): Add more debug information. Fix erroneous use of transport instead of conn. * cygserver_transport_pipes.cc (transport_layer_pipes::close): More debug. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::impersonate_client): Ditto. Mon Oct 8 7:41:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (server_request::process): Rename client_request_shm_get to client_request_shm. * cygserver_process.cc (process_cache::add): Rename to add_task. Use process_cleanup instead of process_request. (process_cache::remove_process): New method. (process::process): Initialize new members. (process::~process): New member. (process::cleanup): New method. (process::add_cleanup_routine): New method. (process_request::process): Rename to process_cleanup. Call the process object's cleanup method and then delete it. (process_process_param::request_loop): Remove the signalling process. * cygserver_shm.cc: Globally rename client_request_shm_get to client_request_shm. (client_request_shm_get::serve): Handle attach request counting. * cygserver_shm.h: Globally rename client_request_shm_get to client_request_shm. (class shm_cleanup): New class. * shm.cc: Globally rename client_request_shm_get to client_request_shm. (client_request_shm::client_request_shm): New constructor for attach requests. (shmat): Use it. * include/cygwin/cygserver_process.h (class process_request): Rename to process_cleanup. (class cleanup_routine): New class. (class process): New members and methods to allow calling back when the process terminates. Thu Oct 4 14:12:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (request_loop): Make static. (main): Use new cache constructor syntax. Start cache worker threads. Cleanup the cache at shutdown. * cygserver_process.cc: Run indent. (process_cache::process_cache): Add a trigger to use when adding a process. (process_cache::process): Move process_entry to process. Insert at the end of the list. Trigger the request loop when new process's inserted. (process_cache::process_requests): Do it. (process_cache::add): New method. (process_cache::handle_snapshot): New method. (process::process): Merge in the process_entry fields. (process::handle): Make a stub function. (process::exit_code): New method. (process_request::process): New method. (process_process_param::request_loop): New method. * cygserver_shm.cc: New header dependency - threaded_queue.h. * threaded_queue.cc (threaded_queue::cleanup): Clearer messages. (queue_process_param::stop): Short spinlock on interruptible threads. * threaded_queue.h (class threaded_queue): New constructor. * include/cygwin/cygserver_process.h (process_request): New class. (process_entry): Remove. (process): Merge in process_entry. (process_cache): Inherit from threaded_queue. Tue Oct 2 23:24:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (class server_process_param): Use new constructor syntax. * cygserver_process.cc (process_cache::~process_cache): New function. * threaded_queue.cc: Define condition debug_printf. Run indent. (threaded_queue::cleanup): Move queue_process_param guts to a method. (threaded_queue::process_requests): Ditto. (queue_process_param::queue_process_param): New method. (queue_process_param::~queue_process_param): Ditto. (queue_process_param::start): Ditto. (queue_process_param::stop): Ditto. * threaded_queue.h (class queue_process_param): Add support for interruptible request loops. * cygwin/include/cygwin/cygserver_process.h (class process_cache): Add destructor. Tue Oct 2 23:24:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver_client.cc: New flag allow_daemon to disable the daemon completely. (cygserver_request): Check it. (cygserver_init): Ditto. * environ.cc (parse_thing): Add (no)daemon option. Tue Oct 2 23:00:00 2001 Robert Collins <rbtcollins@hotmail.com> * shm.cc: Update to handle include changes from HEAD. Tue Oct 2 16:06:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Remove cygserver_shm.o from cygwin1.dll. Rename cygserver_shm_outside.o to cygserver_shm.o. * cygserver.cc (server_request::process): Use the new client_request constructor. * cygserver_client.cc: Remove the #ifdef's stubs for the server method within cygwin. (client_request_attach_tty::client_request_attach_tty): Use the new client_request constructor. (client_request_shutdown::client_request_shutdown): Ditto. (client_request::client_request): Ditto. * cygserver_shm.cc (client_request_shm_get::serve): Remove the #ifdef'd stub for in-cygwin builds. (client_request_shm_get::client_request_shm_get): Use the new client_request constructor, and remove the in-cygwin variants. * cygserver_shm.h (class client_request_shm_get): #ifndef test the serve method - it's only used in cygserver. * shm.cc (client_request_shm_get::client_request_shm_get): New function. * include/cygwin/cygserver.h (request_header): New constructor. (class client_request): Use it. New constructor accepting the header size. #ifndef test the server method - it's only used within cygserver. (client_request_get_version): #ifdef test the server method. (client_request_shutdown): Ditto. (client_request_attach_tty): Ditto. Tue Oct 2 9:57:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: add threaded_queue.o to cygserver.exe. * cygserver.cc: Include threaded_queue.h (class server_request): Inherit from queue_request. (class server_process_param): Inherit from queue_process_param. (class server_request_queue): Inherit from threaded_queue. (request_loop): Adjust for new types. (server_request_queue::process_requests): Remove guts to threaded_queue::process_requests. (server_request::server_request): Adjust for new types. (worker_function): Delete. (server_request_queue::create_workers): Delete. (server_request_queue::cleanup): Delete. (server_request_queue::add): Move guts to threaded_queue::add. * threaded_queue.cc: New file. * threaded_queue.h: New file. Mon Oct 1 12:38:00 2001 Robert Collins <rbtcollins@hotmail.com> * cygserver.cc (client_request::serve): New function. * cygserver_process.cc: Inlude <pthread.h> for pthread_once. (process_cache::process_cache): Initialise a crtiical section for write access. (process_cache::process): Use the critical section. Also add missing entries to the cache. (do_process_init): New function to initalise class process static variables. (process::process): Ensure that the process access critical section is initialised. (process::handle): Close the handle of old process's when they have terminated and we are returning the handle for a process with the same pid. * cygserver_shm.cc: Run indent. Include cygserver_process.h to allow process cache functionality. (client_request_shm_get::serve): New parameter for process cache support. Use the process cache, not OpenProcess to get a handle to the originating process. Fix a handle leak with token_handle. * cygserver_shm.h (class client_request_shm_get): Update ::serve for process cache support. * cygserver_transport_pipes.cc: Redefine debug_printf to be conditional on DEBUG. * include/cygwin/cygserver.h: Do not implement client_request::serve in the header. * include/cygwin/cygserver_process.h (class process_cache): Add a write access critical section to prevent races when requests from a multithreaded application arrive. Sun Sep 30 23:41:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Add cygserver_process.o to cygserver.exe. * cygserver.cc: Include signal.h and cygwin_version.h. Define debug_printf as a macro. Define DEBUG to a value. (client_request_attach_tty::serve): Add beginning of process cache support. Change from #ifdef DEBUG to work with new DEBUG style. (client_request_get_version::serve): Add beginning of process cache support. (class server_request): New prototype for support of process cache. (class queue_process_param): New class to allow request loop threading. (class server_request_queue): Add beginning of process cache support. Allow request loop threading. (request_loop): Thread function for request loops. (server_request_queue::process_requests): Initiator for threaded request loops. (client_request_shutdown::serve): Add beginning of process cache support. (server_request::server_request): Ditto. (server_request::process): Use debug_printf. Add beginning of process cache support. (server_request_queue::cleanup): Kill off any request loop threads. (server_request_queue::add): Add beginning of process cache support. (handle_signal): Trigger a shutdown. (main): Print out some useful info at startup - version, date time. Add process cache support. Spawn a separate thread for the transport request loop, thus allowing concurrent support for multiple transports. * cygserver_client.cc (client_request_get_version::serve): Add process cache support. (client_request_attach_tty::serve): Add process cache support. (client_request_shutdown::serve): Add process cache support. * cygsserver_process.cc: New file with the process cache support. * cygserver_shm.cc: Redefine debug_printf to allow conditional output. * cygwin.din: Export shmdt(). * shm.cc: Run indent. Update FIXME's. (shmdt): New function. * include/cygwin/cygserver.h (class client_request): Add process cache support. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. * include/cygwin/cygserver_process.h: New header for process cache support. Sun Sep 30 8:52:00 2001 Robert Collins <rbtcollins@hotmail.com> * include/cygwin/cygserver_transport.h: Add copyright header. * include/cygwin/cygserver_transport_pipes.h: Ditto. * include/cygwin/cygserver_transport_sockets.h: Ditto. Sat Sep 29 20:40:00 2001 Robert Collins <rbtcollins@hotmail.com> * Makefile.in: Add cygserver_transport_sockets.o to DLL_OFILES. Add cygserver_transport_sockets_outside.o to cygserver.exe. * cygserver.cc: Include new include files. * cygserver_client.cc: Ditto. * cygserver_shm.h: No need to include <sys/socket.h> now. * cygerver_transport.cc: Include new include files. (transport_layer_base::transport_layer_base): Strip back to a stub. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport_pipes.cc: Include new header "cygwin/cygserver_transport_pipes.h". * cygserver_transport_sockets.cc: New file. * dcrt0.cc: No need to include <sys/socket.h> now. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. * include/cygwin/cygserver_transport.h: Strip the base class to a stub. Remove the cygserver_transport_pipes class. * include/cygwin/cygserver_transport_pipes.h: New file. * include/cygwin/cygserver_transport_sockets.h: New file. Tue Sep 25 16:22:00 2001 Robert Collins <rbtcollins@hotmail.com> * autoload.cc: Add dynamic load statement for 'ImpersonateNamedPipeClient'. * Makefile.in: Add new object files, and build instructions for cygserver.exe. * cygwin.din: Export ftok, shmat, shmctl and shmget. * dcrt0.cc: Additional includes for cygserver support. (dll_crt0_1): Initialise the cygserver client. * fhandler.h (fhandler_tty): New method cygserver_attach_tty. * fhandler_tty.cc: Additional includes for cygserver support. (fhandler_tty_slave::open): Attempt to use the cygserver when obtaining handles from the parent process. On failure or 9x use the current method. (fhandler_tty_slave::cygserver_attach_tty): New function. * fork.cc (fork_child): Fixup shm memory mapped areas. * pinfo.h: Declare fixup_shms_after_fork(). * security.h: Declare alloc_sd(). * tty.cc: Additonal includes to support cygserver. (tty::common_init): Don't allow others to open us if the cygserver is running. * winsup.h: Declare cygserver_running. * cygserver.cc: New file. * cygserver_client.cc: New file. * cygserver_shm.cc: New file. * cygserver_shm.h: New file. * cygserver_transport.cc: New file. * cygserver_transport_pipes.cc: New file. * ipc.cc: New file. * shm.cc: New file. * include/cygwin/cygserver.h: New file. * include/cygwin/cygserver_transport.h: New file. * include/sys/ipc.h: New file. * include/sys/shm.h: New file. 2002-02-28 Robert Collins <rbtcollins@hotmail.com> * thread.cc (semaphore::TryWait): Set errno as required by posix 1003.1. (__sem_wait): Ditto. (__sem_trywait): Ditto.
2002-02-28 15:30:38 +01:00
/* FIXME: we shold NOT set the security wide open when the
daemon is running
*/
2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> GNUify non-GNU formatted functions calls throughout. 2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Remove macro. (server_shmmgr::segment_t::~segment_t): Remove calls to with_strerr. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::new_segment): Ditto. * shm.cc (with_strerr): Remove macro. (client_shmmgr::shmdt): Remove calls to with_strerr. (client_shmmgr::attach): Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h: Move to "include/cygwin/ipc.h". * include/sys/msg.h: Move to "include/cygwin/msg.h". * include/sys/sem.h: Move to "include/cygwin/sem.h". * include/sys/shm.h: Move to "include/cygwin/shm.h". * include/cygwin/ipc.h: New file. * include/cygwin/msg.h: Ditto. * include/cygwin/sem.h: Ditto. * include/cygwin/shm.h: Ditto. * cygserver_shm.h: Update includes. * msg.cc: Ditto. * sem.cc: Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h (safe_delete): Make a templated function. * cygserver.cc (~server_request): Update use of safe_delete. (main): Ditto. * cygserver_client.cc (client_request::handle_request): Ditto. (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::remove): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. * cygserver_shm.cc (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::delete_segment): Ditto. * shm.cc (client_shmmgr::shmdt): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. 2002-08-29 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Replace #include <new> with an explicit definition of the placement new operator. (safe_delete): Remove unnecessary ## operator. 2002-07-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr): Remove `cleanup_t' friend declaration. (cleanup_t::cleanup_t): Use the segment's shmid as the key rather than the segment pointer itself. (cleanup_t::segptr): Remove method. (cleanup_t::shmid): New method. (cleanup_t::cleanup): Update for new key value. (server_shmmgr::find (segment_t *)): Remove method. * include/cygwin/cygserver_process.h (cleanup_routine::key): Make method const. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_process.h (cleanup_routine::_key): New field. (cleanup_routine::cleanup_routine): Initialise new field with new argument. (cleanup_routine::operator==): New method. (cleanup_routine::key): New method. (cleanup_routine::cleanup): Make argument non-const. (process::is_active): New method. (process::remove): Ditto. (process::check_exit_code): Rename method. * cygserver_process.cc (process::add): Reorganize code. (process::remove): New method. (process::check_exit_code): Rename method. (process::cleanup): Use new `process::is_active' method. (process_cache::process): Ditto. (process_cache::sync_wait_array): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr): Make `cleanup_t' a friend. (segment_t::detach): Make argument non-const. Remove cleanup object from client if appropriate. (cleanup_t::_segptr): Remove field. (cleanup_t::cleanup_t): Initialise parent explicitly. Remove field. (cleanup_t::segptr): New method. (cleanup_t::cleanup): Add error checking and reporting. (server_shmmgr::shmdt): Make argument non-const. (server_shmmgr::find (segment_t *)): New method. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::client_request_shutdown): Comment out verbose tracing statement. * cygserver_client.cc (client_request_get_version::client_request_get_version): Ditto. (client_request_attach_tty::client_request_attach_tty): Ditto. * cygserver_shm.cc (client_request_shm::client_request_shm): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::listen): Set `_is_listening_endpoint' appropriately. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::listen): Change return type. (transport_layer_base::connect): Ditto. * include/cygwin/cygserver_transport_pipes.h (transport_layer_pipes::listen): Change return type. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::_sec_none_nih): Remove unused field. (transport_layer_pipes::_is_listening_endpoint): New field. * cygserver_transport_pipes.cc: Synchronize with sockets code. (transport_layer_pipes::transport_layer_pipes): Initialise new field. Separate out asserts. (transport_layer_pipes::listen): Change return type. Add asserts. (transport_layer_pipes::accept): Add asserts. (transport_layer_pipes::read): Change conditional to an assert. Add assert. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Change return type. Change conditional to an assert. Add asserts. Rationalize error code slightly. (transport_layer_pipes::impersonate_client): Add asserts. * include/cygwin/cygserver_transport_sockets.h (transport_layer_sockets::listen): Change return type. (transport_layer_sockets::connect): Ditto. (transport_layer_sockets::_addr): Change type of field. (transport_layer_sockets::_addr_len): Ditto. (transport_layer_sockets::_is_accepted_endpoint): New field. (transport_layer_sockets::_is_listening_endpoint): Ditto. * cygserver_transport_sockets.cc (MAX_CONNECT_RETRY): New constant. (transport_layer_sockets::transport_layer_sockets): Initialise new fields. Only initialise the socket address where necessary. (transport_layer_sockets::listen): Change return type. Rewrite. (transport_layer_sockets::accept): Add asserts. Add tracing statements. Use a local variable to hold the accepted address. (transport_layer_sockets::close): Add tracing statements. Unlink the UNIX domain socket file as appropriate. Close the socket cleanly. (transport_layer_sockets::read): Rewrite method. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Change return type. Rewrite. * cygserver.cc (server_submission_loop::request_loop): Run the listening thread at high priority with special handling for shutdown. (main): Print the request error code rather than errno in shutdown request code. Install signal handlers with sigaction(2) to avoid setting SA_RESTART. Check value of the listen method call, now it has one. * cygserver_client.cc (client_request::make_request): Check new return value on connect method call. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::_sd): Rename field. (cygserver_transport_pipes::_sec_none_nih): Ditto. (cygserver_transport_pipes::_sec_all_nih): Ditto. (cygserver_transport_pipes::_pipe_name): Ditto. (cygserver_transport_pipes::_hPipe): Ditto. (cygserver_transport_pipes::_is_accepted_endpoint): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Rename fields. (transport_layer_pipes::init_security): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. (transport_layer_pipes::close): Ditto. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::_fd): Rename field. (cygserver_transport_sockets::_addr): Ditto. (cygserver_transport_sockets::_addr_len): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::transport_layer_sockets): Rename fields. (transport_layer_sockets::listen): Ditto. (transport_layer_sockets::accept): Ditto. (transport_layer_sockets::close): Ditto. (transport_layer_sockets::read): Ditto. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Fix use of %p format. * shm.cc (client_shmmgr::shmat): Ditto. (client_shmmgr::shmctl): Ditto. (client_shmmgr::shmdt): Ditto. (client_shmmgr::attach): Ditto. 2002-07-14 Christopher Faylor <cgf@redhat.com> * woutsup.h (system_printf): Remove extraneous semicolon from macro definition. 2002-07-14 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::connect): Use ProtectHandle in DLL code. (transport_layer_pipes::close): Use ForceCloseHandle in DLL code. 2002-07-13 Nicholas Wourms <nwourms@netscape.com> * threaded_queue.h (class queue_submission_loop): Correct friend declaration for GCC 3.1.1. * include/cygwin/cygserver_process.h (class process): Ditto. (class process_cache): Ditto. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::shmdt): Only call delete_segment if the segment exists [sic]. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Include <new> rather than <new.h> for gcc 3. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: New file extracted from "woutsup.h". * woutsup.h: Move the "safe" new/delete macros into the new "safe_memory.h" header file and include that here. * cygserver_client.cc: Explicitly include "safe_memory.h" for client-side code. (client_request::make_request): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * cygserver_transport.cc: Explicitly include "safe_memory.h" for client-side code. (create_server_transport): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * shm.cc: Include "safe_memory.h". (client_shmmgr::instance): Use the "safe" new/delete macros. (client_shmmgr::shmdt): Ditto. (client_shmmgr::new_segment): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_process (process::process): Add the client's cygpid and winpid to all tracing statements as appropriate. (process::exit_code): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::shmat): Ditto. (server_shmmgr::shmdt): Ditto. (server_shmmgr::shmctl): Add a process object argument and remove the explicit cygpid argument. Add the client's cygpid and winpid to all tracing statements as appropriate. (server_shmmgr::shmget): Ditto. (client_request_shm::serve): Update for the new signature of the shmctl and shmget methods. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::serve): Don't set the shutdown flag directly, but send a SIGINT, as the signal handler sets the flag and the signal breaks the pause(2) in the main loop. (print_usage): Add new options. (main): Add new --cleanup-threads and --request-threads options to set the number of threads used by the daemon. Use pause(2) rather the win32 Sleep in the main loop. * shm.cc (shmat): Add sigframe. (shmctl): Ditto. (shmdt): Ditto. (shmget): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Automatically detach processes from any segments they are attached to at exit. (class server_shmmgr::attach_t): New class. (server_shmmgr::segment_t::IS_DELETED): Rename and make private. (server_shmmgr::segment_t::_sequence): Make private. (server_shmmgr::segment_t::_flg): Ditto. (server_shmmgr::segment_t::_hFileMap): Ditto. (server_shmmgr::segment_t::_attach_head): New private field. (server_shmmgr::segment_t::segment_t): Initialise new fields. Make non-inline. (server_shmmgr::segment_t::~segment_t): New method. (server_shmmgr::segment_t::is_deleted): Ditto. (server_shmmgr::segment_t::is_pending_delete): Ditto. (server_shmmgr::segment_t::mark_deleted): Ditto. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::segment_t::find): Ditto. (class server_shmmgr::cleanup_t): New class. (server_shmmgr::_shm_atts): New private field. (server_shmmgr::shmat): Add a process object argument to replace the removed process_cache, cygpid and winpid arguments. Remove the process_cache manipulations. Move body of code to the segment_t::attach method. Increment _shm_atts when required. Update tracing statements. (server_shmmgr::shmdt): Add a process object argument to replace the removed cygpid argument. Move body of code to the segment_t::detach method. Decrement _shm_atts when required. Update tracing statements. (server_shmmgr::shmget): Use the new segment_t::is_deleted method. (server_shmmgr::server_shmmgr): Initialise the new _shm_atts field. (server_shmmgr::delete_segment): Remove the CloseHandle code, as this is now done in the segment_t destructor. (client_request_shm::serve): Look up the client's process object and pass to the server_shmmgr::shmat and server_shmmgr::shmdt methods rather than passing the cache, winpid and cygpid. * cygserver_process.h: Add a cygpid to the process object to make it more useful and then pass process objects rather than winpids where possible. (cleanup_routine::cleanup): Change argument to be a pointer to a process object. (class process): Re-order fields for no discernible reason. (process::_cygpid): New field. (process::process): Add a cygpid argument. (process::winpid): New method. (process::cygpid): Ditto. (process::add): Make public, as it always should have been. (process_cache::process): Add a cygpid argument. * cygserver_process.cc (process::process): Add a cygpid argument and use it to initialise the `_cygpid' field. Re-order initialisers to match new field order. (process::cleanup): Pass `this' rather than just the winpid to cleanup_routine::cleanup. (process_cache::process): Add a cygpid argument and pass it to the process object constructor. * include/sys/shm.h (shmatt_t): Make unsigned as per SUSv3. (shm_info::shm_atts): New field. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr::segment_t): Add `_' prefix to the names of all fields. 2002-07-10 Conrad Scott <conrad.scott@dsl.pipex.com> * msg.cc: New file of stub functions, no functionality. * sem.cc: Ditto. * shm.cc (client_shmmgr::shmctl): Add support for an out shm_info buffer for the SHM_INFO command. (client_shmmgr::shmget): Use %X to print keys. * include/sys/ipc.h: Comment all fields and values. (IPC_PRIVATE): Change to be non-negative. * include/sys/msg.h: New file with SUSv3 and ipcs(8) interfaces. * include/sys/sem.h: Ditto. * include/sys/shm.h: Comment all fields and values. (struct shm_info): New struct. * cygserver_shm.h (client_request_shm::shminfo): Rename. (client_request_shm::shm_info): New method. (client_request_shm::_parameters.out.hFileMap): Move into union. (client_request_shm::_parameters.out.shminfo): Rename. (client_request_shm::_parameters.out.shm_info): New field. * cygserver_shm.cc (server_shmmgr::_shm_ids): Rename. (server_shmmgr::_shm_tot): New field. (server_shmmgr::shmctl): Rename `out_shminfo' argument. Add `out_shm_info' argument. Fill in the `out_shm_info' argument in the SHM_INFO command. (server_shmmgr::shmget): Check `shmflg' against the mode of existing segments as per Stevens 1990, p. 123. (server_shmmgr::server_shmmgr): Initialise the new `_shm_tot' field. (server_shmmgr::new_segment): Set ENOMEM if CreateFileMapping fails. Pass `size' to new_segment. (server_shmmgr::new_segment): Add size argument and use it to check against and update the new `_shm_tot' field. (server_shmmgr::delete_segment): Update the new `_shm_tot' field. * Makefile.in (DLL_OFILES): Add new DLL object files. 2002-07-09 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc: The main change is to make the client try harder to connect to the server if it's previously connected, and so has good grounds for believing that the server is running. (MAX_WAIT_NAMED_PIPE_RETRY): Change to be an enumerator. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::accept): Use interlocked operators on `pipe_instance'. (transport_layer_pipes::close): Rearrange so that FlushFileBuffers and DisconnectNamedPipe are only called for accepted endpoints. Use interlocked operators on `pipe_instance'. (transport_layer_pipes::read): Use set_errno where required. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Add local static variable `assume_cygserver'. Set it if a connection is made to cygserver, clear it if a connection is not made even after retrying. If set, ignore all errors from CreateFile and retry the connection. Catch the situation where WaitNamedPipe fails to wait [sic] and add a `Sleep (0)' so that the server gets a chance to run. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * dcrt0.cc: Only check for cygserver if and when required. (dll_crt0_1): Remove call to `cygserver_init ()'. * fhandler_tty.cc (fhandler_tty_slave::open): Change the cygserver logic to allow for the fact that `cygserver_init ()' may not yet have been called. (fhandler_tty_slave::cygserver_attach_tty): Tweak the cygserver request logic to conform to the practice elsewhere in the code. * tty.cc (tty::common_init): Add an explicit call to `cygserver_init ()' if it hasn't already been called. * include/cygwin/cygserver.h (CYGSERVER_UNAVAIL): Rename from `CYGSERVER_DEAD'. (client_request_get_version::check_version): Make available in cygserver as well the DLL. (check_cygserver_available): Ditto. Remove `check_version_too' argument. (cygserver_init): Ditto. And likewise. * cygserver_client.cc (client_request_get_version::check_version): Make available in cygserver as well the DLL. (client_request::make_request): This may now be called without `cygserver_init ()' having been called first. Detect this and call it as required. Add tracing. (check_cygserver_available): Make available in cygserver as well the DLL. Remove `check_version_too' argument and always check the version information. And since this is called from within `cygserver_init ()', force `cygserver_running' before calling `client_request::make_request ()'. (cygserver_init): Make available in cygserver as well the DLL. Remove `check_version_too' argument. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Implement the ipcs(8) interfaces, IPC_INFO, SHM_STAT and SHM_INFO. (server_shmmgr::segment_t::sequence): New static field. (server_shmmgr::segment_t::key): Remove field, use the new ds.shm_perm.key field instead. (server_shmmgr::segment_t::shmid): Remove field. (server_shmmgr::segment_t::intid): New field. (server_shmmgr::segment_t::segment_t): Use the `key' argument to initialise `ds.shm_perm.key'. Change from using `shmid' to `intid'. (server_shmmgr::_shmseg_cnt): Renamed from `_shmid_cnt'. (server_shmmgr::_intid_max): Renamed from `_shmid_max. (server_shmmgr::shmat): Move the out arguments to the start of the argument list. Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmctl): Add separate out arguments. Rename the `pid' argument as `cygpid'. Add support for the ipcs(8) interfaces. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmdt): Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmget): Add a separate out arguments. Rename the `pid' argument as `cygpid'. Add tracing. (server_shmmgr::server_shmmgr): Update for new field names. (server_shmmgr::find_by_key): Update for the new `ds.shm_perm.key' field. (server_shmmgr::find): Update to use the new `segment_t::intid' field. (server_shmmgr::new_segment): Rename the `pid' argument as `cygpid'. Check that the requested size is within bounds. Handle new error result from `new_segment (key, HANDLE)'. (server_shmmgr::new_segment): Work with intids, not shmids. Check that the new intid is within bounds. Update for new field names. (server_shmmgr::delete_segment): Pass an intid to `find ()', not a shmid. Update for new field names. (client_request_shm::serve): Check that the incoming message length is the size of the `_parameters.in' struct, not of the whole in/out parameter union. Likewise, set the outgoing message length to the size of the `_parameters.out' struct. Update for the new server_shmmgr interfaces. * include/sys/ipc.h (ipc_perm::key): New field. * include/sys/shm.h (SHM_INFO): New constant. * cygserver_ipc.h (IPCMNI): New constant. (ipc_int2ext): Add `sequence' argument and munge this into the external ipc id. (ipc_ext2int_subsys): Unmunge the sequence number from the external ipc id. (ipc_ext2int): Ditto. (ipc_inc_id): Remove. (ipc_dec_id): Remove. * cygserver_shm.h (SHMMAX): New constant. (SHMMIN): Ditto. (SHMMNI): Ditto. (SHMSEG): Ditto. (SHMALL): Ditto. (client_request_shm::_parameters): Re-arrange as a union of two separate structs, one for in arguments, the other for out. (client_request_shm::shmid): Update for the new parameter layout. (client_request_shm::ds): Ditto. (client_request_shm::info): New method. * shm.cc (client_shmmgr::_shmat_cnt): New static field. (client_shmmgr::shmat): Add locking. Add tracing. (client_shmmgr::shmctl): Update for ipcs(8) commands. Add tracing. Add more argument checking. (client_shmmgr::shmdt): Add locking. Add tracing. Update the new `_shmat_cnt' field. (client_shmmgr::shmget): Add tracing. (client_shmmgr::fixup_shms_after_fork): Add tracing. Add consistency checking. (client_shmmgr::attach): Add more tracing. (client_shmmgr::new_segment): Update the new `_shmat_cnt' field. (client_request_shm::client_request_shm): Update for the new parameter layout. Set the outgoing message length to the size of the `_parameters.in' struct, not of the whole in/out parameter union. 2002-07-02 Conrad Scott <conrad.scott@dsl.pipex.com> * shm.cc: Remove the use of a static client_shmmgr object. (client_shmmgr::_instance): New static variable. (client_shmmgr::instance): Allocate a new shmmgr on the heap, rather than using a local static object. 2002-07-01 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport.cc (create_server_transport): Fix cut-and-paste error. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Don't bother with the client request activity marker when compiled with debugging output. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (MAX_WAIT_NAMED_PIPE_RETRY): New constant. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::close): The `pipe' field is now either NULL or a valid handle, and it should never have the value `INVALID_HANDLE_VALUE'. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::connect): Ditto. New, but still bogus, retry logic. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::server_shmmgr): All fields have to be initialized now that the singleton is no longer static. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::_instance): New static field. (server_shmmgr::_instance_once): Ditto. (server_shmmgr::initialise_instance): New static method. (server_shmmgr::instance): Use a pthread_once_t rather than relying on a local static variable. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: Remove all uses of the C++ new and delete operators throughout cygserver until they are fully thread-safe. (safe_new0): New macro to replace the C++ new operator. (safe_new): Ditto. (safe_delete): New macro to replace the C++ delete operator. * cygserver_client.cc (client_request::handle_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::new_segment): Ditto. (server_shmmgr::delete_segment): Ditto. * cygserver_transport.cc (create_server_transport): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::accept): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. (threaded_queue::stop): Replace sleep(3) with win32 Sleep. * cygserver.cc (~server_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (server_submission_loop::request_loop): Ditto. (main): Ditto. Replace sleep(3) with win32 Sleep. Replace iostreams with FILEs. (print_usage): Replace iostreams with FILEs. (print_version): Ditto. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Rename local variable `accept_fd' to avoid shadowing the `fd' field. 2002-06-29 Conrad Scott <conrad.scott@dsl.pipex.com> * cygwin_ipc.h: Moved (back) to "include/sys/ipc.h". * cygwin_shm.h: Moved (back) to "include/sys/shm.h". * include/sys/ipc.h: New file. * include/sys/shm.h: New file. * cygserver_shm.h: Update for new header file locations. * ipc.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::make_request): Comment out a verbose tracing statement. * cygserver_process.cc (process_cache::sync_wait_array): Fix broken assert. * include/cygwin/cygserver.h (class client_request): Remove excess use of `class' qualifier in declarations. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_ipc.h: New file. * cygserver_shm.h: Re-written from scratch. * cygserver_shm.cc: Ditto. * shm.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * threaded_queue.h (class queue_request): Re-write. (threaded_queue_thread_function): Remove. (class queue_process_param): Remove. (class threaded_queue): Re-write. (class queue_submission_loop): New version of the old `queue_process_param' class. (TInterlockedExchangePointer): New templated function. (TInterlockedCompareExchangePointer): Ditto. * threaded_queue.cc (worker_function): Remove. (class threaded_queue): Re-write. (class queue_process_param): Remove. (class queue_submission_loop): New version of the old `queue_process_param' class. * include/cygwin/cygserver_process.h (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver_process.cc (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver.cc (request_count): Remove unused variable. (class server_request): Move methods inline. (class server_process_param): Remove. (class server_request_queue): Remove. (request_queue): Move into `main ()' and change type to `threaded_queue'. (request_loop): Remove. (class server_submission_loop): New version of the old `server_process_param' class. (shutdown_server): New variable. (client_request_shutdown::serve): Set `shutdown_server' to trigger shutdown. (handle_signal): Ditto. (main): Install signal handler for SIGINT rather than SIGQUIT. Use new interfaces for the `request_queue' and the `cache'. Create a `server_submission_loop' and add to the `request_queue'. Add check for the `shutdown_server' variable to the main loop. * cygserver_shm.cc (client_request_shm::serve): Release the process object after use. 2002-06-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Correct tracing statement. * cygserver_transport_pipes.cc: Remove local definition of FILE_FLAG_FIRST_PIPE_INSTANCE constant. * cygwin_ipc.h: Update copyright notice. * cygwin_shm.h: Ditto. * woutsup.h: Add definition of _WIN32_WINNT. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client (client_request::make_request): Replace my inappropriate use of set_errno () with error_code () throughout. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Add forward declarations of class transport_layer_base and class process_cache to reduce dependencies between header files. * include/cygwin/cygserver_process.h: Add include of "threaded_queue.h". * cygserver.cc: Remove unnecessary cygserver header files. * cygserver_client.cc: Ditto. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_shm.h: Ditto. * cygserver_transport_pipes.cc: Ditto. * dcrt0.cc: Ditto. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after merge from HEAD. * cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in merge from HEAD. * cygwin_shm.h: Ditto. 2002-06-21 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: The tests for a duplicate server instance are now the responsibility of the transport layer. (request_loop): Use new `recoverable' flag in call to `cygserver_transport::accept ()' and shutdown on an unrecoverable error. (main): Never call `cygserver_init ()'. Fake `cygserver_running' just for sending a shutdown request. * cygserver_client.cc (client_request::send): Comment out message-size tracing statements as verbose. (client_request::handle): Ditto. (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver.h (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver_transport.h (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. Add a `recoverable' out flag for error handling. * include/cygwin/cygserver_transport_sockets.h: Ditto. * include/cygwin/cygserver_transport_pipes.h: Ditto. (transport_layer_pipes): Change type of the `pipe_name' field. Remove the `inited' field, as unnecessary. Add new `is_accepted_endpoint' field. * include/cygwin/cygserver_transport.cc (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.cc (transport_layer_sockets::listen): #ifdef as cygserver-only. (transport_layer_sockets::accept): #ifdef as cygserver-only. Analyse any errno from `accept ()' and set `recoverable' as appropriate. * cygserver_transport_pipes.cc: Add local #define of `FILE_FLAG_FIRST_PIPE_INSTANCE'. (pipe_instance_lock_once): New variable. (pipe_instance_lock): Ditto. (pipe_instance): Ditto. (initialise_pipe_instance_lock): New function. (transport_layer_pipes::transport_layer_pipes): Change initialization of `pipe_name'. Initialize `is_accepted_endpoint' as appropriate. Remove use of `inited'. (transport_layer_pipes::impersonate_client): #ifdef as cygserver-only. (transport_layer_pipes::revert_to_self): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. Keep track of how often many named pipes have been created, in the `pipe_instance' variable, and pass the `FILE_FLAG_FIRST_PIPE_INSTANCE' flag on the open of the first instance. Analyse the error code from `CreateNamedPipe ()' and set the `recoverable' flag as appropriate. (transport_layer_pipes::close): Update the `pipe_instance' count. 2002-06-18 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h (cygserver_running): Add declaration. (api_fatal): Eliminate. * include/cygwin/cygserver.h (client_request_get_version::check_version): Change return type to bool. (check_cygserver_available): New function. (cygserver_init): Add check_version_too argument. * cygserver_client.cc (allow_daemon): Make a bool. (client_request_get_version::make_request): See errno on error. Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now handled in cygserver_init(). (client_request_get_version::check_version): Use syscall_printf() instead of api_fatal(). Return true if cygserver version is compatible. (check_cygserver_available): New function; code moved here from cygserver_init(). (cygserver_init): Move some code into check_cygserver_available(). * cygserver.cc (__set_errno): Copy from debug.cc so that set_errno() can be used when __OUTSIDE_CYGWIN__. (main): Call cygserver_init() to set up cygserver_running and add checks against this to (try and) prevent multiple copies of cygserver running simultaneously. Remember to delete all transport connections so that (one day) the transport classes can tidy up on cygserver shutdown. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (main): Adjust tracing output for a cleaner display when compiled without --enable-debugging. * threaded_queue.cc (threaded_queue::cleanup): Ditto. (queue_process_param::stop): Ditto. * include/cygwin/cygserver.h (client_request::make_request): Make non-virtual. (client_request::send): Make virtual and protected, not private. (client_request_attach_tty::send): New virtual method. * cygserver_client.cc: Use the `msglen()' accessor rather than `_header.msglen' throughout. (client_request_attach_tty::send): New method. (client_request::make_request): Remove the explicit close of `transport' as it is closed on deletion. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Change the client_request classes to give greater encapsulation and to allow variable length requests and replies. (enum cygserver_request_code): Now client_request::request_code_t. (class request_header): Now client_request::header_t. Make a union of the request_code and the error_code. The `cb' field, which was the buffer length, is now the `size_t msglen' field. (struct request_get_version): Now client_request_get_version::request_get_version. (struct request_shutdown): Remove unused type. (struct request_attach_tty): Now client_request_attach_tty::request_attach_tty. (client_request::_buf): Make field const. (client_request::_buflen): New const private field. (client_request::request_code): New accessor. (client_request::error_code): Ditto. (client_request::msglen): Ditto. (client_request::handle_request): New static method. (client_request::make_request): New virtual method. (client_request::handle): New method. (client_request::send): Make private. (client_request_get_version::check_version): New method. (client_request_get_version::serve): Make private. (client_request_get_version::version): Ditto. (client_request_shutdown::serve): Ditto. (client_request_attach_tty::req): Ditto. (client_request_attach_tty::serve): Ditto. (client_request_attach_tty::from_master): Make method const. (client_request_attach_tty::from_master): Ditto. * cygserver_client.cc (client_request_get_version::client_request_get_version): Track changes to the client_request classes. (client_request_attach_tty::client_request_attach_tty): Ditto. (client_request_get_version::check_version): New method to encapsulate code from cygserver_init(). (client_request_shutdown::client_request_shutdown): Move into "cygserver.cc". (client_request::send): Track changes to the client_request classes. Add more error checking. (client_request::handle_request): New static method containing the first half of the old server_request::process() code. (client_request::make_request): New method to replace the old cygserver_request() function. (client_request::handle): New method containing the second half of the old server_request::process() code. (cygserver_init): Track changes to the client_request classes. In particular, some code moved into the client_request_get_version::check_version() method. * cygserver.cc (client_request_attach_tty::serve): Track changes to the client_request classes. In particular, only return a reply body if some handles are successfully duplicated for the client. And remove goto's. (client_request_get_version::serve): Track changes to the client_request classes. (client_request_shutdown::serve): Ditto. (class client_request_invalid): Dead, and so young too. (server_request::request_buffer): Remove unnecessary field. (client_request_shutdown::client_request_shutdown): Moved here from "cygserver_client.cc". (server_request::process): Implementation moved into the new client_request::handle_request() and client_request::handle() methods. * cygserver_shm.h (class client_request_shm): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. (client_request_shm::serve): Make private. * cygserver_shm.cc (client_request_shm::client_request_shm): Track changes to the client_request classes. (client_request_shm::serve): Ditto * shm.cc (client_request_shm::client_request_shm): Ditto. Use alloc_sd() rather than set_security_attribute() to get access to the SECURITY_DESCRIPTOR length, so that we can use it to set the request body length. (shmat): Track changes to the client_request classes. In particular, allocate client_request objects on the stack rather than on the heap, and use the client_request::make_request() method rather than the old cygserver_request() function. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. * fhandler_tty.cc (fhandler_tty_slave::cygserver_attach_tty): Ditto. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (cygserver_transport::read): Change buffer type to void *. (cygserver_transport::write): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::read): Ditto. (cygserver_transport_pipes::write): Ditto. * cygserver_transport_sockets.cc (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * cygserver_transport_pipes.cc (cygserver_transport_pipes::read): Ditto. Set errno on error, to match behaviour of cygserver_transport_sockets class. (cygserver_transport_pipes::write): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (version): New static variable. (server_request_queue::add_connection): Remove my gratuitous use of studly caps. (setup_privileges): Declare static. (handle_signal): Ditto. (longopts): Make a local variable of main(). (opts): Ditto. (print_usage): New function. (print_version): Ditto (tip of the hat to Joshua Daniel Franklin for inspiration here). (main): More argument checking. Add --help and --version options. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::serve): Make pure virtual. * cygserver.cc (client_request::serve): Remove definition of pure virtual method. (class client_request_invalid): New class. (server_request::process): Use new client_request_invalid class. And remove goto's. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (class server_request): Add virtual destructor. (server_request_queue::addConnection): New method to replace bad virtual add() method. (request_loop): Replace call to queue->add() with call to queue->addConnection(). (server_request::server_request): Use field initialization. (server_request::~server_request): New virtual destructor. (server_request::process): Remove close and delete of transport_layer_base object. It is deleted by the server_request's own destructor and closed by its own destructor. * include/cygwin/cygserver.h (client_request::operator request_header): Remove unused method. * cygserver_client.cc: Ditto. * include/cygwin/cygserver_process.h (class cleanup_routine): Add virtual destructor. (cleanup_routine::cleanup): Make pure virtual. (class process_cache): Make destructor non-virtual. (process_cache::add): Ditto. * cygserver_process.cc (cleanup_routine::~cleanup_routine): New virtual destructor. * include/cygwin/cygserver_transport.h (class transport_layer_base): Add virtual destructor. * cygserver_transport.cc (transport_layer_base::~transport_layer_base): New virtual destructor. * include/cygwin/cygserver_transport_pipes.h (class transport_layer_pipes): Add virtual destructor. * cygserver_transport_pipes.cc (transport_layer_pipes::~transport_layer_pipes): New virtual destructor. (transport_layer_pipes::close): Null out handle after closing. * include/cygwin/cygserver_transport_sockets.h (class transport_layer_sockets): Add virtual destructor. * cygserver_transport_sockets.cc (transport_layer_sockets::~transport_layer_sockets): New virtual destructor. (transport_layer_sockets::close): Null out fd after closing. * threaded_queue.h (class queue_request): Add virtual destructor. (queue_request::process): Make pure virtual. * threaded_queue.cc (~queue_request): New virtual destructor. (queue_request::process): Remove definition of pure virtual method. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::send): Make non-virtual. (class client_request_attach_tty): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. * cygserver_client.cc: Ditto. (cygserver_init): Fix error handling. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: Throughout the code, check and correct level of the XXX_printf() functions used. Comment out several of the debug_printf() calls with "// verbose:". Reformat and correct typos of some of the XXX_printf() formats. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * shm.cc (hi_ulong): New function to allow printing of a 64-bit key with current small_printf implementation. (lo_ulong): Ditto. (client_request_shm::client_request_shm): Use hi_ulong() and lo_ulong() in call to debug_printf(). 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Remove #define __INSIDE_CYGWIN__ from around <sys/shm.h> as it no longer contains any internal code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h (IPC_PRIVATE): Add cast to key_t. (IPC_INFO): New flag for ipcs(8). (IPC_RMID IPC_SET IPC_STAT): Renumber. * include/sys/shm.h (SHM_RDONLY SHM_RND): Renumber with distinct values [sic]. (class _shmattach): Internal type moved to "cygserver_shm.h". (class shmnode): Ditto. (class shmid_ds): Ditto. (struct shmid_ds): Add spare fields. (struct shminfo): New type for IPC_INFO interface. * cygserver_shm.h: Remove obsolete #if 0 ... #endif block. (class shm_cleanup): Remove unused class. (struct _shmattach): Internal type moved from <sys/shm.h>. (struct shmnode): Ditto. (struct int_shmid_ds): Ditto. Renamed to avoid name clash with public interface struct shmid_ds. Use the shmid_bs structure as a field. * cygserver_shm.cc: Remove obsolete #if 0 ... #endif block. (client_request_shm::serve): Update for redefinition of int_shmid_ds structure. * shm.cc (build_inprocess_shmds): Ditto. (fixup_shms_after_fork): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove obsolete #if 0 ... #endif code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Make a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport.cc (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Remove since it is now a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (check_and_dup_handle): Only use security code if running on NT, i.e. if wincap.has_security(). (client_request_attach_tty::serve): Add check for has_security(). * cygserver_process.cc (process_cache::process): Use DWORD winpid throughout to avoid win32 vs. cygwin pid confusion. (process::process): Ditto. * cygserver_shm.cc (client_request_shm::serve): Only use security code if running on NT, i.e. if wincap.has_security(). * cygserver_shm.h (client_request_shm::parameters.in): Replace the ambiguous pid field with cygpid and winpid fields. (client_request_shm::client_request_shm): Reduce to only two client-side constructors: one for SHM_CREATE, another for all the other requests. * shm.cc (client_request_shm::client_request_shm): Ditto. Initialize cygpid and winpid fields here. On NT initialize sd_buf here using set_security_attribute() to make use of the euid and egid. (shmat): Use new client_request_shm constructor. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove security code, now performed in the relevant client_request_shm constructor. * include/cygwin/cygserver_process.h: (class cleanup_routine): Change winpid type to DWORD. (class process): Ditto. 2002-06-15 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: New file. * cygserver.cc: Use "woutsup.h" and new XXX_printf macros. (getfunc): New function, copied verbatim from "strace.cc". (__cygserver__printf): New function. * cygserver_client.cc: Use "woutsup.h" and new XXX_printf macros. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * threaded_queue.cc: Ditto. * shm.cc: Remove trailing \n from XXX_printf format strings. * Makefile.in: Remove special __OUTSIDE_CYGWIN__ case for cygserver_shm.cc.
2002-09-22 14:04:15 +02:00
if (wincap.has_security ())
{
#ifdef USE_SERVER
2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> GNUify non-GNU formatted functions calls throughout. 2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Remove macro. (server_shmmgr::segment_t::~segment_t): Remove calls to with_strerr. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::new_segment): Ditto. * shm.cc (with_strerr): Remove macro. (client_shmmgr::shmdt): Remove calls to with_strerr. (client_shmmgr::attach): Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h: Move to "include/cygwin/ipc.h". * include/sys/msg.h: Move to "include/cygwin/msg.h". * include/sys/sem.h: Move to "include/cygwin/sem.h". * include/sys/shm.h: Move to "include/cygwin/shm.h". * include/cygwin/ipc.h: New file. * include/cygwin/msg.h: Ditto. * include/cygwin/sem.h: Ditto. * include/cygwin/shm.h: Ditto. * cygserver_shm.h: Update includes. * msg.cc: Ditto. * sem.cc: Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h (safe_delete): Make a templated function. * cygserver.cc (~server_request): Update use of safe_delete. (main): Ditto. * cygserver_client.cc (client_request::handle_request): Ditto. (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::remove): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. * cygserver_shm.cc (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::delete_segment): Ditto. * shm.cc (client_shmmgr::shmdt): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. 2002-08-29 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Replace #include <new> with an explicit definition of the placement new operator. (safe_delete): Remove unnecessary ## operator. 2002-07-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr): Remove `cleanup_t' friend declaration. (cleanup_t::cleanup_t): Use the segment's shmid as the key rather than the segment pointer itself. (cleanup_t::segptr): Remove method. (cleanup_t::shmid): New method. (cleanup_t::cleanup): Update for new key value. (server_shmmgr::find (segment_t *)): Remove method. * include/cygwin/cygserver_process.h (cleanup_routine::key): Make method const. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_process.h (cleanup_routine::_key): New field. (cleanup_routine::cleanup_routine): Initialise new field with new argument. (cleanup_routine::operator==): New method. (cleanup_routine::key): New method. (cleanup_routine::cleanup): Make argument non-const. (process::is_active): New method. (process::remove): Ditto. (process::check_exit_code): Rename method. * cygserver_process.cc (process::add): Reorganize code. (process::remove): New method. (process::check_exit_code): Rename method. (process::cleanup): Use new `process::is_active' method. (process_cache::process): Ditto. (process_cache::sync_wait_array): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr): Make `cleanup_t' a friend. (segment_t::detach): Make argument non-const. Remove cleanup object from client if appropriate. (cleanup_t::_segptr): Remove field. (cleanup_t::cleanup_t): Initialise parent explicitly. Remove field. (cleanup_t::segptr): New method. (cleanup_t::cleanup): Add error checking and reporting. (server_shmmgr::shmdt): Make argument non-const. (server_shmmgr::find (segment_t *)): New method. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::client_request_shutdown): Comment out verbose tracing statement. * cygserver_client.cc (client_request_get_version::client_request_get_version): Ditto. (client_request_attach_tty::client_request_attach_tty): Ditto. * cygserver_shm.cc (client_request_shm::client_request_shm): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::listen): Set `_is_listening_endpoint' appropriately. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::listen): Change return type. (transport_layer_base::connect): Ditto. * include/cygwin/cygserver_transport_pipes.h (transport_layer_pipes::listen): Change return type. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::_sec_none_nih): Remove unused field. (transport_layer_pipes::_is_listening_endpoint): New field. * cygserver_transport_pipes.cc: Synchronize with sockets code. (transport_layer_pipes::transport_layer_pipes): Initialise new field. Separate out asserts. (transport_layer_pipes::listen): Change return type. Add asserts. (transport_layer_pipes::accept): Add asserts. (transport_layer_pipes::read): Change conditional to an assert. Add assert. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Change return type. Change conditional to an assert. Add asserts. Rationalize error code slightly. (transport_layer_pipes::impersonate_client): Add asserts. * include/cygwin/cygserver_transport_sockets.h (transport_layer_sockets::listen): Change return type. (transport_layer_sockets::connect): Ditto. (transport_layer_sockets::_addr): Change type of field. (transport_layer_sockets::_addr_len): Ditto. (transport_layer_sockets::_is_accepted_endpoint): New field. (transport_layer_sockets::_is_listening_endpoint): Ditto. * cygserver_transport_sockets.cc (MAX_CONNECT_RETRY): New constant. (transport_layer_sockets::transport_layer_sockets): Initialise new fields. Only initialise the socket address where necessary. (transport_layer_sockets::listen): Change return type. Rewrite. (transport_layer_sockets::accept): Add asserts. Add tracing statements. Use a local variable to hold the accepted address. (transport_layer_sockets::close): Add tracing statements. Unlink the UNIX domain socket file as appropriate. Close the socket cleanly. (transport_layer_sockets::read): Rewrite method. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Change return type. Rewrite. * cygserver.cc (server_submission_loop::request_loop): Run the listening thread at high priority with special handling for shutdown. (main): Print the request error code rather than errno in shutdown request code. Install signal handlers with sigaction(2) to avoid setting SA_RESTART. Check value of the listen method call, now it has one. * cygserver_client.cc (client_request::make_request): Check new return value on connect method call. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::_sd): Rename field. (cygserver_transport_pipes::_sec_none_nih): Ditto. (cygserver_transport_pipes::_sec_all_nih): Ditto. (cygserver_transport_pipes::_pipe_name): Ditto. (cygserver_transport_pipes::_hPipe): Ditto. (cygserver_transport_pipes::_is_accepted_endpoint): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Rename fields. (transport_layer_pipes::init_security): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. (transport_layer_pipes::close): Ditto. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::_fd): Rename field. (cygserver_transport_sockets::_addr): Ditto. (cygserver_transport_sockets::_addr_len): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::transport_layer_sockets): Rename fields. (transport_layer_sockets::listen): Ditto. (transport_layer_sockets::accept): Ditto. (transport_layer_sockets::close): Ditto. (transport_layer_sockets::read): Ditto. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Fix use of %p format. * shm.cc (client_shmmgr::shmat): Ditto. (client_shmmgr::shmctl): Ditto. (client_shmmgr::shmdt): Ditto. (client_shmmgr::attach): Ditto. 2002-07-14 Christopher Faylor <cgf@redhat.com> * woutsup.h (system_printf): Remove extraneous semicolon from macro definition. 2002-07-14 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::connect): Use ProtectHandle in DLL code. (transport_layer_pipes::close): Use ForceCloseHandle in DLL code. 2002-07-13 Nicholas Wourms <nwourms@netscape.com> * threaded_queue.h (class queue_submission_loop): Correct friend declaration for GCC 3.1.1. * include/cygwin/cygserver_process.h (class process): Ditto. (class process_cache): Ditto. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::shmdt): Only call delete_segment if the segment exists [sic]. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Include <new> rather than <new.h> for gcc 3. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: New file extracted from "woutsup.h". * woutsup.h: Move the "safe" new/delete macros into the new "safe_memory.h" header file and include that here. * cygserver_client.cc: Explicitly include "safe_memory.h" for client-side code. (client_request::make_request): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * cygserver_transport.cc: Explicitly include "safe_memory.h" for client-side code. (create_server_transport): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * shm.cc: Include "safe_memory.h". (client_shmmgr::instance): Use the "safe" new/delete macros. (client_shmmgr::shmdt): Ditto. (client_shmmgr::new_segment): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_process (process::process): Add the client's cygpid and winpid to all tracing statements as appropriate. (process::exit_code): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::shmat): Ditto. (server_shmmgr::shmdt): Ditto. (server_shmmgr::shmctl): Add a process object argument and remove the explicit cygpid argument. Add the client's cygpid and winpid to all tracing statements as appropriate. (server_shmmgr::shmget): Ditto. (client_request_shm::serve): Update for the new signature of the shmctl and shmget methods. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::serve): Don't set the shutdown flag directly, but send a SIGINT, as the signal handler sets the flag and the signal breaks the pause(2) in the main loop. (print_usage): Add new options. (main): Add new --cleanup-threads and --request-threads options to set the number of threads used by the daemon. Use pause(2) rather the win32 Sleep in the main loop. * shm.cc (shmat): Add sigframe. (shmctl): Ditto. (shmdt): Ditto. (shmget): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Automatically detach processes from any segments they are attached to at exit. (class server_shmmgr::attach_t): New class. (server_shmmgr::segment_t::IS_DELETED): Rename and make private. (server_shmmgr::segment_t::_sequence): Make private. (server_shmmgr::segment_t::_flg): Ditto. (server_shmmgr::segment_t::_hFileMap): Ditto. (server_shmmgr::segment_t::_attach_head): New private field. (server_shmmgr::segment_t::segment_t): Initialise new fields. Make non-inline. (server_shmmgr::segment_t::~segment_t): New method. (server_shmmgr::segment_t::is_deleted): Ditto. (server_shmmgr::segment_t::is_pending_delete): Ditto. (server_shmmgr::segment_t::mark_deleted): Ditto. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::segment_t::find): Ditto. (class server_shmmgr::cleanup_t): New class. (server_shmmgr::_shm_atts): New private field. (server_shmmgr::shmat): Add a process object argument to replace the removed process_cache, cygpid and winpid arguments. Remove the process_cache manipulations. Move body of code to the segment_t::attach method. Increment _shm_atts when required. Update tracing statements. (server_shmmgr::shmdt): Add a process object argument to replace the removed cygpid argument. Move body of code to the segment_t::detach method. Decrement _shm_atts when required. Update tracing statements. (server_shmmgr::shmget): Use the new segment_t::is_deleted method. (server_shmmgr::server_shmmgr): Initialise the new _shm_atts field. (server_shmmgr::delete_segment): Remove the CloseHandle code, as this is now done in the segment_t destructor. (client_request_shm::serve): Look up the client's process object and pass to the server_shmmgr::shmat and server_shmmgr::shmdt methods rather than passing the cache, winpid and cygpid. * cygserver_process.h: Add a cygpid to the process object to make it more useful and then pass process objects rather than winpids where possible. (cleanup_routine::cleanup): Change argument to be a pointer to a process object. (class process): Re-order fields for no discernible reason. (process::_cygpid): New field. (process::process): Add a cygpid argument. (process::winpid): New method. (process::cygpid): Ditto. (process::add): Make public, as it always should have been. (process_cache::process): Add a cygpid argument. * cygserver_process.cc (process::process): Add a cygpid argument and use it to initialise the `_cygpid' field. Re-order initialisers to match new field order. (process::cleanup): Pass `this' rather than just the winpid to cleanup_routine::cleanup. (process_cache::process): Add a cygpid argument and pass it to the process object constructor. * include/sys/shm.h (shmatt_t): Make unsigned as per SUSv3. (shm_info::shm_atts): New field. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr::segment_t): Add `_' prefix to the names of all fields. 2002-07-10 Conrad Scott <conrad.scott@dsl.pipex.com> * msg.cc: New file of stub functions, no functionality. * sem.cc: Ditto. * shm.cc (client_shmmgr::shmctl): Add support for an out shm_info buffer for the SHM_INFO command. (client_shmmgr::shmget): Use %X to print keys. * include/sys/ipc.h: Comment all fields and values. (IPC_PRIVATE): Change to be non-negative. * include/sys/msg.h: New file with SUSv3 and ipcs(8) interfaces. * include/sys/sem.h: Ditto. * include/sys/shm.h: Comment all fields and values. (struct shm_info): New struct. * cygserver_shm.h (client_request_shm::shminfo): Rename. (client_request_shm::shm_info): New method. (client_request_shm::_parameters.out.hFileMap): Move into union. (client_request_shm::_parameters.out.shminfo): Rename. (client_request_shm::_parameters.out.shm_info): New field. * cygserver_shm.cc (server_shmmgr::_shm_ids): Rename. (server_shmmgr::_shm_tot): New field. (server_shmmgr::shmctl): Rename `out_shminfo' argument. Add `out_shm_info' argument. Fill in the `out_shm_info' argument in the SHM_INFO command. (server_shmmgr::shmget): Check `shmflg' against the mode of existing segments as per Stevens 1990, p. 123. (server_shmmgr::server_shmmgr): Initialise the new `_shm_tot' field. (server_shmmgr::new_segment): Set ENOMEM if CreateFileMapping fails. Pass `size' to new_segment. (server_shmmgr::new_segment): Add size argument and use it to check against and update the new `_shm_tot' field. (server_shmmgr::delete_segment): Update the new `_shm_tot' field. * Makefile.in (DLL_OFILES): Add new DLL object files. 2002-07-09 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc: The main change is to make the client try harder to connect to the server if it's previously connected, and so has good grounds for believing that the server is running. (MAX_WAIT_NAMED_PIPE_RETRY): Change to be an enumerator. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::accept): Use interlocked operators on `pipe_instance'. (transport_layer_pipes::close): Rearrange so that FlushFileBuffers and DisconnectNamedPipe are only called for accepted endpoints. Use interlocked operators on `pipe_instance'. (transport_layer_pipes::read): Use set_errno where required. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Add local static variable `assume_cygserver'. Set it if a connection is made to cygserver, clear it if a connection is not made even after retrying. If set, ignore all errors from CreateFile and retry the connection. Catch the situation where WaitNamedPipe fails to wait [sic] and add a `Sleep (0)' so that the server gets a chance to run. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * dcrt0.cc: Only check for cygserver if and when required. (dll_crt0_1): Remove call to `cygserver_init ()'. * fhandler_tty.cc (fhandler_tty_slave::open): Change the cygserver logic to allow for the fact that `cygserver_init ()' may not yet have been called. (fhandler_tty_slave::cygserver_attach_tty): Tweak the cygserver request logic to conform to the practice elsewhere in the code. * tty.cc (tty::common_init): Add an explicit call to `cygserver_init ()' if it hasn't already been called. * include/cygwin/cygserver.h (CYGSERVER_UNAVAIL): Rename from `CYGSERVER_DEAD'. (client_request_get_version::check_version): Make available in cygserver as well the DLL. (check_cygserver_available): Ditto. Remove `check_version_too' argument. (cygserver_init): Ditto. And likewise. * cygserver_client.cc (client_request_get_version::check_version): Make available in cygserver as well the DLL. (client_request::make_request): This may now be called without `cygserver_init ()' having been called first. Detect this and call it as required. Add tracing. (check_cygserver_available): Make available in cygserver as well the DLL. Remove `check_version_too' argument and always check the version information. And since this is called from within `cygserver_init ()', force `cygserver_running' before calling `client_request::make_request ()'. (cygserver_init): Make available in cygserver as well the DLL. Remove `check_version_too' argument. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Implement the ipcs(8) interfaces, IPC_INFO, SHM_STAT and SHM_INFO. (server_shmmgr::segment_t::sequence): New static field. (server_shmmgr::segment_t::key): Remove field, use the new ds.shm_perm.key field instead. (server_shmmgr::segment_t::shmid): Remove field. (server_shmmgr::segment_t::intid): New field. (server_shmmgr::segment_t::segment_t): Use the `key' argument to initialise `ds.shm_perm.key'. Change from using `shmid' to `intid'. (server_shmmgr::_shmseg_cnt): Renamed from `_shmid_cnt'. (server_shmmgr::_intid_max): Renamed from `_shmid_max. (server_shmmgr::shmat): Move the out arguments to the start of the argument list. Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmctl): Add separate out arguments. Rename the `pid' argument as `cygpid'. Add support for the ipcs(8) interfaces. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmdt): Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmget): Add a separate out arguments. Rename the `pid' argument as `cygpid'. Add tracing. (server_shmmgr::server_shmmgr): Update for new field names. (server_shmmgr::find_by_key): Update for the new `ds.shm_perm.key' field. (server_shmmgr::find): Update to use the new `segment_t::intid' field. (server_shmmgr::new_segment): Rename the `pid' argument as `cygpid'. Check that the requested size is within bounds. Handle new error result from `new_segment (key, HANDLE)'. (server_shmmgr::new_segment): Work with intids, not shmids. Check that the new intid is within bounds. Update for new field names. (server_shmmgr::delete_segment): Pass an intid to `find ()', not a shmid. Update for new field names. (client_request_shm::serve): Check that the incoming message length is the size of the `_parameters.in' struct, not of the whole in/out parameter union. Likewise, set the outgoing message length to the size of the `_parameters.out' struct. Update for the new server_shmmgr interfaces. * include/sys/ipc.h (ipc_perm::key): New field. * include/sys/shm.h (SHM_INFO): New constant. * cygserver_ipc.h (IPCMNI): New constant. (ipc_int2ext): Add `sequence' argument and munge this into the external ipc id. (ipc_ext2int_subsys): Unmunge the sequence number from the external ipc id. (ipc_ext2int): Ditto. (ipc_inc_id): Remove. (ipc_dec_id): Remove. * cygserver_shm.h (SHMMAX): New constant. (SHMMIN): Ditto. (SHMMNI): Ditto. (SHMSEG): Ditto. (SHMALL): Ditto. (client_request_shm::_parameters): Re-arrange as a union of two separate structs, one for in arguments, the other for out. (client_request_shm::shmid): Update for the new parameter layout. (client_request_shm::ds): Ditto. (client_request_shm::info): New method. * shm.cc (client_shmmgr::_shmat_cnt): New static field. (client_shmmgr::shmat): Add locking. Add tracing. (client_shmmgr::shmctl): Update for ipcs(8) commands. Add tracing. Add more argument checking. (client_shmmgr::shmdt): Add locking. Add tracing. Update the new `_shmat_cnt' field. (client_shmmgr::shmget): Add tracing. (client_shmmgr::fixup_shms_after_fork): Add tracing. Add consistency checking. (client_shmmgr::attach): Add more tracing. (client_shmmgr::new_segment): Update the new `_shmat_cnt' field. (client_request_shm::client_request_shm): Update for the new parameter layout. Set the outgoing message length to the size of the `_parameters.in' struct, not of the whole in/out parameter union. 2002-07-02 Conrad Scott <conrad.scott@dsl.pipex.com> * shm.cc: Remove the use of a static client_shmmgr object. (client_shmmgr::_instance): New static variable. (client_shmmgr::instance): Allocate a new shmmgr on the heap, rather than using a local static object. 2002-07-01 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport.cc (create_server_transport): Fix cut-and-paste error. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Don't bother with the client request activity marker when compiled with debugging output. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (MAX_WAIT_NAMED_PIPE_RETRY): New constant. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::close): The `pipe' field is now either NULL or a valid handle, and it should never have the value `INVALID_HANDLE_VALUE'. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::connect): Ditto. New, but still bogus, retry logic. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::server_shmmgr): All fields have to be initialized now that the singleton is no longer static. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::_instance): New static field. (server_shmmgr::_instance_once): Ditto. (server_shmmgr::initialise_instance): New static method. (server_shmmgr::instance): Use a pthread_once_t rather than relying on a local static variable. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: Remove all uses of the C++ new and delete operators throughout cygserver until they are fully thread-safe. (safe_new0): New macro to replace the C++ new operator. (safe_new): Ditto. (safe_delete): New macro to replace the C++ delete operator. * cygserver_client.cc (client_request::handle_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::new_segment): Ditto. (server_shmmgr::delete_segment): Ditto. * cygserver_transport.cc (create_server_transport): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::accept): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. (threaded_queue::stop): Replace sleep(3) with win32 Sleep. * cygserver.cc (~server_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (server_submission_loop::request_loop): Ditto. (main): Ditto. Replace sleep(3) with win32 Sleep. Replace iostreams with FILEs. (print_usage): Replace iostreams with FILEs. (print_version): Ditto. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Rename local variable `accept_fd' to avoid shadowing the `fd' field. 2002-06-29 Conrad Scott <conrad.scott@dsl.pipex.com> * cygwin_ipc.h: Moved (back) to "include/sys/ipc.h". * cygwin_shm.h: Moved (back) to "include/sys/shm.h". * include/sys/ipc.h: New file. * include/sys/shm.h: New file. * cygserver_shm.h: Update for new header file locations. * ipc.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::make_request): Comment out a verbose tracing statement. * cygserver_process.cc (process_cache::sync_wait_array): Fix broken assert. * include/cygwin/cygserver.h (class client_request): Remove excess use of `class' qualifier in declarations. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_ipc.h: New file. * cygserver_shm.h: Re-written from scratch. * cygserver_shm.cc: Ditto. * shm.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * threaded_queue.h (class queue_request): Re-write. (threaded_queue_thread_function): Remove. (class queue_process_param): Remove. (class threaded_queue): Re-write. (class queue_submission_loop): New version of the old `queue_process_param' class. (TInterlockedExchangePointer): New templated function. (TInterlockedCompareExchangePointer): Ditto. * threaded_queue.cc (worker_function): Remove. (class threaded_queue): Re-write. (class queue_process_param): Remove. (class queue_submission_loop): New version of the old `queue_process_param' class. * include/cygwin/cygserver_process.h (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver_process.cc (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver.cc (request_count): Remove unused variable. (class server_request): Move methods inline. (class server_process_param): Remove. (class server_request_queue): Remove. (request_queue): Move into `main ()' and change type to `threaded_queue'. (request_loop): Remove. (class server_submission_loop): New version of the old `server_process_param' class. (shutdown_server): New variable. (client_request_shutdown::serve): Set `shutdown_server' to trigger shutdown. (handle_signal): Ditto. (main): Install signal handler for SIGINT rather than SIGQUIT. Use new interfaces for the `request_queue' and the `cache'. Create a `server_submission_loop' and add to the `request_queue'. Add check for the `shutdown_server' variable to the main loop. * cygserver_shm.cc (client_request_shm::serve): Release the process object after use. 2002-06-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Correct tracing statement. * cygserver_transport_pipes.cc: Remove local definition of FILE_FLAG_FIRST_PIPE_INSTANCE constant. * cygwin_ipc.h: Update copyright notice. * cygwin_shm.h: Ditto. * woutsup.h: Add definition of _WIN32_WINNT. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client (client_request::make_request): Replace my inappropriate use of set_errno () with error_code () throughout. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Add forward declarations of class transport_layer_base and class process_cache to reduce dependencies between header files. * include/cygwin/cygserver_process.h: Add include of "threaded_queue.h". * cygserver.cc: Remove unnecessary cygserver header files. * cygserver_client.cc: Ditto. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_shm.h: Ditto. * cygserver_transport_pipes.cc: Ditto. * dcrt0.cc: Ditto. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after merge from HEAD. * cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in merge from HEAD. * cygwin_shm.h: Ditto. 2002-06-21 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: The tests for a duplicate server instance are now the responsibility of the transport layer. (request_loop): Use new `recoverable' flag in call to `cygserver_transport::accept ()' and shutdown on an unrecoverable error. (main): Never call `cygserver_init ()'. Fake `cygserver_running' just for sending a shutdown request. * cygserver_client.cc (client_request::send): Comment out message-size tracing statements as verbose. (client_request::handle): Ditto. (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver.h (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver_transport.h (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. Add a `recoverable' out flag for error handling. * include/cygwin/cygserver_transport_sockets.h: Ditto. * include/cygwin/cygserver_transport_pipes.h: Ditto. (transport_layer_pipes): Change type of the `pipe_name' field. Remove the `inited' field, as unnecessary. Add new `is_accepted_endpoint' field. * include/cygwin/cygserver_transport.cc (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.cc (transport_layer_sockets::listen): #ifdef as cygserver-only. (transport_layer_sockets::accept): #ifdef as cygserver-only. Analyse any errno from `accept ()' and set `recoverable' as appropriate. * cygserver_transport_pipes.cc: Add local #define of `FILE_FLAG_FIRST_PIPE_INSTANCE'. (pipe_instance_lock_once): New variable. (pipe_instance_lock): Ditto. (pipe_instance): Ditto. (initialise_pipe_instance_lock): New function. (transport_layer_pipes::transport_layer_pipes): Change initialization of `pipe_name'. Initialize `is_accepted_endpoint' as appropriate. Remove use of `inited'. (transport_layer_pipes::impersonate_client): #ifdef as cygserver-only. (transport_layer_pipes::revert_to_self): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. Keep track of how often many named pipes have been created, in the `pipe_instance' variable, and pass the `FILE_FLAG_FIRST_PIPE_INSTANCE' flag on the open of the first instance. Analyse the error code from `CreateNamedPipe ()' and set the `recoverable' flag as appropriate. (transport_layer_pipes::close): Update the `pipe_instance' count. 2002-06-18 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h (cygserver_running): Add declaration. (api_fatal): Eliminate. * include/cygwin/cygserver.h (client_request_get_version::check_version): Change return type to bool. (check_cygserver_available): New function. (cygserver_init): Add check_version_too argument. * cygserver_client.cc (allow_daemon): Make a bool. (client_request_get_version::make_request): See errno on error. Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now handled in cygserver_init(). (client_request_get_version::check_version): Use syscall_printf() instead of api_fatal(). Return true if cygserver version is compatible. (check_cygserver_available): New function; code moved here from cygserver_init(). (cygserver_init): Move some code into check_cygserver_available(). * cygserver.cc (__set_errno): Copy from debug.cc so that set_errno() can be used when __OUTSIDE_CYGWIN__. (main): Call cygserver_init() to set up cygserver_running and add checks against this to (try and) prevent multiple copies of cygserver running simultaneously. Remember to delete all transport connections so that (one day) the transport classes can tidy up on cygserver shutdown. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (main): Adjust tracing output for a cleaner display when compiled without --enable-debugging. * threaded_queue.cc (threaded_queue::cleanup): Ditto. (queue_process_param::stop): Ditto. * include/cygwin/cygserver.h (client_request::make_request): Make non-virtual. (client_request::send): Make virtual and protected, not private. (client_request_attach_tty::send): New virtual method. * cygserver_client.cc: Use the `msglen()' accessor rather than `_header.msglen' throughout. (client_request_attach_tty::send): New method. (client_request::make_request): Remove the explicit close of `transport' as it is closed on deletion. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Change the client_request classes to give greater encapsulation and to allow variable length requests and replies. (enum cygserver_request_code): Now client_request::request_code_t. (class request_header): Now client_request::header_t. Make a union of the request_code and the error_code. The `cb' field, which was the buffer length, is now the `size_t msglen' field. (struct request_get_version): Now client_request_get_version::request_get_version. (struct request_shutdown): Remove unused type. (struct request_attach_tty): Now client_request_attach_tty::request_attach_tty. (client_request::_buf): Make field const. (client_request::_buflen): New const private field. (client_request::request_code): New accessor. (client_request::error_code): Ditto. (client_request::msglen): Ditto. (client_request::handle_request): New static method. (client_request::make_request): New virtual method. (client_request::handle): New method. (client_request::send): Make private. (client_request_get_version::check_version): New method. (client_request_get_version::serve): Make private. (client_request_get_version::version): Ditto. (client_request_shutdown::serve): Ditto. (client_request_attach_tty::req): Ditto. (client_request_attach_tty::serve): Ditto. (client_request_attach_tty::from_master): Make method const. (client_request_attach_tty::from_master): Ditto. * cygserver_client.cc (client_request_get_version::client_request_get_version): Track changes to the client_request classes. (client_request_attach_tty::client_request_attach_tty): Ditto. (client_request_get_version::check_version): New method to encapsulate code from cygserver_init(). (client_request_shutdown::client_request_shutdown): Move into "cygserver.cc". (client_request::send): Track changes to the client_request classes. Add more error checking. (client_request::handle_request): New static method containing the first half of the old server_request::process() code. (client_request::make_request): New method to replace the old cygserver_request() function. (client_request::handle): New method containing the second half of the old server_request::process() code. (cygserver_init): Track changes to the client_request classes. In particular, some code moved into the client_request_get_version::check_version() method. * cygserver.cc (client_request_attach_tty::serve): Track changes to the client_request classes. In particular, only return a reply body if some handles are successfully duplicated for the client. And remove goto's. (client_request_get_version::serve): Track changes to the client_request classes. (client_request_shutdown::serve): Ditto. (class client_request_invalid): Dead, and so young too. (server_request::request_buffer): Remove unnecessary field. (client_request_shutdown::client_request_shutdown): Moved here from "cygserver_client.cc". (server_request::process): Implementation moved into the new client_request::handle_request() and client_request::handle() methods. * cygserver_shm.h (class client_request_shm): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. (client_request_shm::serve): Make private. * cygserver_shm.cc (client_request_shm::client_request_shm): Track changes to the client_request classes. (client_request_shm::serve): Ditto * shm.cc (client_request_shm::client_request_shm): Ditto. Use alloc_sd() rather than set_security_attribute() to get access to the SECURITY_DESCRIPTOR length, so that we can use it to set the request body length. (shmat): Track changes to the client_request classes. In particular, allocate client_request objects on the stack rather than on the heap, and use the client_request::make_request() method rather than the old cygserver_request() function. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. * fhandler_tty.cc (fhandler_tty_slave::cygserver_attach_tty): Ditto. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (cygserver_transport::read): Change buffer type to void *. (cygserver_transport::write): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::read): Ditto. (cygserver_transport_pipes::write): Ditto. * cygserver_transport_sockets.cc (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * cygserver_transport_pipes.cc (cygserver_transport_pipes::read): Ditto. Set errno on error, to match behaviour of cygserver_transport_sockets class. (cygserver_transport_pipes::write): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (version): New static variable. (server_request_queue::add_connection): Remove my gratuitous use of studly caps. (setup_privileges): Declare static. (handle_signal): Ditto. (longopts): Make a local variable of main(). (opts): Ditto. (print_usage): New function. (print_version): Ditto (tip of the hat to Joshua Daniel Franklin for inspiration here). (main): More argument checking. Add --help and --version options. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::serve): Make pure virtual. * cygserver.cc (client_request::serve): Remove definition of pure virtual method. (class client_request_invalid): New class. (server_request::process): Use new client_request_invalid class. And remove goto's. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (class server_request): Add virtual destructor. (server_request_queue::addConnection): New method to replace bad virtual add() method. (request_loop): Replace call to queue->add() with call to queue->addConnection(). (server_request::server_request): Use field initialization. (server_request::~server_request): New virtual destructor. (server_request::process): Remove close and delete of transport_layer_base object. It is deleted by the server_request's own destructor and closed by its own destructor. * include/cygwin/cygserver.h (client_request::operator request_header): Remove unused method. * cygserver_client.cc: Ditto. * include/cygwin/cygserver_process.h (class cleanup_routine): Add virtual destructor. (cleanup_routine::cleanup): Make pure virtual. (class process_cache): Make destructor non-virtual. (process_cache::add): Ditto. * cygserver_process.cc (cleanup_routine::~cleanup_routine): New virtual destructor. * include/cygwin/cygserver_transport.h (class transport_layer_base): Add virtual destructor. * cygserver_transport.cc (transport_layer_base::~transport_layer_base): New virtual destructor. * include/cygwin/cygserver_transport_pipes.h (class transport_layer_pipes): Add virtual destructor. * cygserver_transport_pipes.cc (transport_layer_pipes::~transport_layer_pipes): New virtual destructor. (transport_layer_pipes::close): Null out handle after closing. * include/cygwin/cygserver_transport_sockets.h (class transport_layer_sockets): Add virtual destructor. * cygserver_transport_sockets.cc (transport_layer_sockets::~transport_layer_sockets): New virtual destructor. (transport_layer_sockets::close): Null out fd after closing. * threaded_queue.h (class queue_request): Add virtual destructor. (queue_request::process): Make pure virtual. * threaded_queue.cc (~queue_request): New virtual destructor. (queue_request::process): Remove definition of pure virtual method. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::send): Make non-virtual. (class client_request_attach_tty): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. * cygserver_client.cc: Ditto. (cygserver_init): Fix error handling. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: Throughout the code, check and correct level of the XXX_printf() functions used. Comment out several of the debug_printf() calls with "// verbose:". Reformat and correct typos of some of the XXX_printf() formats. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * shm.cc (hi_ulong): New function to allow printing of a 64-bit key with current small_printf implementation. (lo_ulong): Ditto. (client_request_shm::client_request_shm): Use hi_ulong() and lo_ulong() in call to debug_printf(). 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Remove #define __INSIDE_CYGWIN__ from around <sys/shm.h> as it no longer contains any internal code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h (IPC_PRIVATE): Add cast to key_t. (IPC_INFO): New flag for ipcs(8). (IPC_RMID IPC_SET IPC_STAT): Renumber. * include/sys/shm.h (SHM_RDONLY SHM_RND): Renumber with distinct values [sic]. (class _shmattach): Internal type moved to "cygserver_shm.h". (class shmnode): Ditto. (class shmid_ds): Ditto. (struct shmid_ds): Add spare fields. (struct shminfo): New type for IPC_INFO interface. * cygserver_shm.h: Remove obsolete #if 0 ... #endif block. (class shm_cleanup): Remove unused class. (struct _shmattach): Internal type moved from <sys/shm.h>. (struct shmnode): Ditto. (struct int_shmid_ds): Ditto. Renamed to avoid name clash with public interface struct shmid_ds. Use the shmid_bs structure as a field. * cygserver_shm.cc: Remove obsolete #if 0 ... #endif block. (client_request_shm::serve): Update for redefinition of int_shmid_ds structure. * shm.cc (build_inprocess_shmds): Ditto. (fixup_shms_after_fork): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove obsolete #if 0 ... #endif code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Make a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport.cc (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Remove since it is now a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (check_and_dup_handle): Only use security code if running on NT, i.e. if wincap.has_security(). (client_request_attach_tty::serve): Add check for has_security(). * cygserver_process.cc (process_cache::process): Use DWORD winpid throughout to avoid win32 vs. cygwin pid confusion. (process::process): Ditto. * cygserver_shm.cc (client_request_shm::serve): Only use security code if running on NT, i.e. if wincap.has_security(). * cygserver_shm.h (client_request_shm::parameters.in): Replace the ambiguous pid field with cygpid and winpid fields. (client_request_shm::client_request_shm): Reduce to only two client-side constructors: one for SHM_CREATE, another for all the other requests. * shm.cc (client_request_shm::client_request_shm): Ditto. Initialize cygpid and winpid fields here. On NT initialize sd_buf here using set_security_attribute() to make use of the euid and egid. (shmat): Use new client_request_shm constructor. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove security code, now performed in the relevant client_request_shm constructor. * include/cygwin/cygserver_process.h: (class cleanup_routine): Change winpid type to DWORD. (class process): Ditto. 2002-06-15 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: New file. * cygserver.cc: Use "woutsup.h" and new XXX_printf macros. (getfunc): New function, copied verbatim from "strace.cc". (__cygserver__printf): New function. * cygserver_client.cc: Use "woutsup.h" and new XXX_printf macros. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * threaded_queue.cc: Ditto. * shm.cc: Remove trailing \n from XXX_printf format strings. * Makefile.in: Remove special __OUTSIDE_CYGWIN__ case for cygserver_shm.cc.
2002-09-22 14:04:15 +02:00
if (cygserver_running == CYGSERVER_UNKNOWN)
cygserver_init ();
#endif
2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> GNUify non-GNU formatted functions calls throughout. 2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Remove macro. (server_shmmgr::segment_t::~segment_t): Remove calls to with_strerr. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::new_segment): Ditto. * shm.cc (with_strerr): Remove macro. (client_shmmgr::shmdt): Remove calls to with_strerr. (client_shmmgr::attach): Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h: Move to "include/cygwin/ipc.h". * include/sys/msg.h: Move to "include/cygwin/msg.h". * include/sys/sem.h: Move to "include/cygwin/sem.h". * include/sys/shm.h: Move to "include/cygwin/shm.h". * include/cygwin/ipc.h: New file. * include/cygwin/msg.h: Ditto. * include/cygwin/sem.h: Ditto. * include/cygwin/shm.h: Ditto. * cygserver_shm.h: Update includes. * msg.cc: Ditto. * sem.cc: Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h (safe_delete): Make a templated function. * cygserver.cc (~server_request): Update use of safe_delete. (main): Ditto. * cygserver_client.cc (client_request::handle_request): Ditto. (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::remove): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. * cygserver_shm.cc (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::delete_segment): Ditto. * shm.cc (client_shmmgr::shmdt): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. 2002-08-29 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Replace #include <new> with an explicit definition of the placement new operator. (safe_delete): Remove unnecessary ## operator. 2002-07-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr): Remove `cleanup_t' friend declaration. (cleanup_t::cleanup_t): Use the segment's shmid as the key rather than the segment pointer itself. (cleanup_t::segptr): Remove method. (cleanup_t::shmid): New method. (cleanup_t::cleanup): Update for new key value. (server_shmmgr::find (segment_t *)): Remove method. * include/cygwin/cygserver_process.h (cleanup_routine::key): Make method const. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_process.h (cleanup_routine::_key): New field. (cleanup_routine::cleanup_routine): Initialise new field with new argument. (cleanup_routine::operator==): New method. (cleanup_routine::key): New method. (cleanup_routine::cleanup): Make argument non-const. (process::is_active): New method. (process::remove): Ditto. (process::check_exit_code): Rename method. * cygserver_process.cc (process::add): Reorganize code. (process::remove): New method. (process::check_exit_code): Rename method. (process::cleanup): Use new `process::is_active' method. (process_cache::process): Ditto. (process_cache::sync_wait_array): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr): Make `cleanup_t' a friend. (segment_t::detach): Make argument non-const. Remove cleanup object from client if appropriate. (cleanup_t::_segptr): Remove field. (cleanup_t::cleanup_t): Initialise parent explicitly. Remove field. (cleanup_t::segptr): New method. (cleanup_t::cleanup): Add error checking and reporting. (server_shmmgr::shmdt): Make argument non-const. (server_shmmgr::find (segment_t *)): New method. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::client_request_shutdown): Comment out verbose tracing statement. * cygserver_client.cc (client_request_get_version::client_request_get_version): Ditto. (client_request_attach_tty::client_request_attach_tty): Ditto. * cygserver_shm.cc (client_request_shm::client_request_shm): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::listen): Set `_is_listening_endpoint' appropriately. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::listen): Change return type. (transport_layer_base::connect): Ditto. * include/cygwin/cygserver_transport_pipes.h (transport_layer_pipes::listen): Change return type. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::_sec_none_nih): Remove unused field. (transport_layer_pipes::_is_listening_endpoint): New field. * cygserver_transport_pipes.cc: Synchronize with sockets code. (transport_layer_pipes::transport_layer_pipes): Initialise new field. Separate out asserts. (transport_layer_pipes::listen): Change return type. Add asserts. (transport_layer_pipes::accept): Add asserts. (transport_layer_pipes::read): Change conditional to an assert. Add assert. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Change return type. Change conditional to an assert. Add asserts. Rationalize error code slightly. (transport_layer_pipes::impersonate_client): Add asserts. * include/cygwin/cygserver_transport_sockets.h (transport_layer_sockets::listen): Change return type. (transport_layer_sockets::connect): Ditto. (transport_layer_sockets::_addr): Change type of field. (transport_layer_sockets::_addr_len): Ditto. (transport_layer_sockets::_is_accepted_endpoint): New field. (transport_layer_sockets::_is_listening_endpoint): Ditto. * cygserver_transport_sockets.cc (MAX_CONNECT_RETRY): New constant. (transport_layer_sockets::transport_layer_sockets): Initialise new fields. Only initialise the socket address where necessary. (transport_layer_sockets::listen): Change return type. Rewrite. (transport_layer_sockets::accept): Add asserts. Add tracing statements. Use a local variable to hold the accepted address. (transport_layer_sockets::close): Add tracing statements. Unlink the UNIX domain socket file as appropriate. Close the socket cleanly. (transport_layer_sockets::read): Rewrite method. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Change return type. Rewrite. * cygserver.cc (server_submission_loop::request_loop): Run the listening thread at high priority with special handling for shutdown. (main): Print the request error code rather than errno in shutdown request code. Install signal handlers with sigaction(2) to avoid setting SA_RESTART. Check value of the listen method call, now it has one. * cygserver_client.cc (client_request::make_request): Check new return value on connect method call. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::_sd): Rename field. (cygserver_transport_pipes::_sec_none_nih): Ditto. (cygserver_transport_pipes::_sec_all_nih): Ditto. (cygserver_transport_pipes::_pipe_name): Ditto. (cygserver_transport_pipes::_hPipe): Ditto. (cygserver_transport_pipes::_is_accepted_endpoint): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Rename fields. (transport_layer_pipes::init_security): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. (transport_layer_pipes::close): Ditto. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::_fd): Rename field. (cygserver_transport_sockets::_addr): Ditto. (cygserver_transport_sockets::_addr_len): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::transport_layer_sockets): Rename fields. (transport_layer_sockets::listen): Ditto. (transport_layer_sockets::accept): Ditto. (transport_layer_sockets::close): Ditto. (transport_layer_sockets::read): Ditto. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Fix use of %p format. * shm.cc (client_shmmgr::shmat): Ditto. (client_shmmgr::shmctl): Ditto. (client_shmmgr::shmdt): Ditto. (client_shmmgr::attach): Ditto. 2002-07-14 Christopher Faylor <cgf@redhat.com> * woutsup.h (system_printf): Remove extraneous semicolon from macro definition. 2002-07-14 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::connect): Use ProtectHandle in DLL code. (transport_layer_pipes::close): Use ForceCloseHandle in DLL code. 2002-07-13 Nicholas Wourms <nwourms@netscape.com> * threaded_queue.h (class queue_submission_loop): Correct friend declaration for GCC 3.1.1. * include/cygwin/cygserver_process.h (class process): Ditto. (class process_cache): Ditto. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::shmdt): Only call delete_segment if the segment exists [sic]. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Include <new> rather than <new.h> for gcc 3. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: New file extracted from "woutsup.h". * woutsup.h: Move the "safe" new/delete macros into the new "safe_memory.h" header file and include that here. * cygserver_client.cc: Explicitly include "safe_memory.h" for client-side code. (client_request::make_request): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * cygserver_transport.cc: Explicitly include "safe_memory.h" for client-side code. (create_server_transport): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * shm.cc: Include "safe_memory.h". (client_shmmgr::instance): Use the "safe" new/delete macros. (client_shmmgr::shmdt): Ditto. (client_shmmgr::new_segment): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_process (process::process): Add the client's cygpid and winpid to all tracing statements as appropriate. (process::exit_code): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::shmat): Ditto. (server_shmmgr::shmdt): Ditto. (server_shmmgr::shmctl): Add a process object argument and remove the explicit cygpid argument. Add the client's cygpid and winpid to all tracing statements as appropriate. (server_shmmgr::shmget): Ditto. (client_request_shm::serve): Update for the new signature of the shmctl and shmget methods. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::serve): Don't set the shutdown flag directly, but send a SIGINT, as the signal handler sets the flag and the signal breaks the pause(2) in the main loop. (print_usage): Add new options. (main): Add new --cleanup-threads and --request-threads options to set the number of threads used by the daemon. Use pause(2) rather the win32 Sleep in the main loop. * shm.cc (shmat): Add sigframe. (shmctl): Ditto. (shmdt): Ditto. (shmget): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Automatically detach processes from any segments they are attached to at exit. (class server_shmmgr::attach_t): New class. (server_shmmgr::segment_t::IS_DELETED): Rename and make private. (server_shmmgr::segment_t::_sequence): Make private. (server_shmmgr::segment_t::_flg): Ditto. (server_shmmgr::segment_t::_hFileMap): Ditto. (server_shmmgr::segment_t::_attach_head): New private field. (server_shmmgr::segment_t::segment_t): Initialise new fields. Make non-inline. (server_shmmgr::segment_t::~segment_t): New method. (server_shmmgr::segment_t::is_deleted): Ditto. (server_shmmgr::segment_t::is_pending_delete): Ditto. (server_shmmgr::segment_t::mark_deleted): Ditto. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::segment_t::find): Ditto. (class server_shmmgr::cleanup_t): New class. (server_shmmgr::_shm_atts): New private field. (server_shmmgr::shmat): Add a process object argument to replace the removed process_cache, cygpid and winpid arguments. Remove the process_cache manipulations. Move body of code to the segment_t::attach method. Increment _shm_atts when required. Update tracing statements. (server_shmmgr::shmdt): Add a process object argument to replace the removed cygpid argument. Move body of code to the segment_t::detach method. Decrement _shm_atts when required. Update tracing statements. (server_shmmgr::shmget): Use the new segment_t::is_deleted method. (server_shmmgr::server_shmmgr): Initialise the new _shm_atts field. (server_shmmgr::delete_segment): Remove the CloseHandle code, as this is now done in the segment_t destructor. (client_request_shm::serve): Look up the client's process object and pass to the server_shmmgr::shmat and server_shmmgr::shmdt methods rather than passing the cache, winpid and cygpid. * cygserver_process.h: Add a cygpid to the process object to make it more useful and then pass process objects rather than winpids where possible. (cleanup_routine::cleanup): Change argument to be a pointer to a process object. (class process): Re-order fields for no discernible reason. (process::_cygpid): New field. (process::process): Add a cygpid argument. (process::winpid): New method. (process::cygpid): Ditto. (process::add): Make public, as it always should have been. (process_cache::process): Add a cygpid argument. * cygserver_process.cc (process::process): Add a cygpid argument and use it to initialise the `_cygpid' field. Re-order initialisers to match new field order. (process::cleanup): Pass `this' rather than just the winpid to cleanup_routine::cleanup. (process_cache::process): Add a cygpid argument and pass it to the process object constructor. * include/sys/shm.h (shmatt_t): Make unsigned as per SUSv3. (shm_info::shm_atts): New field. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr::segment_t): Add `_' prefix to the names of all fields. 2002-07-10 Conrad Scott <conrad.scott@dsl.pipex.com> * msg.cc: New file of stub functions, no functionality. * sem.cc: Ditto. * shm.cc (client_shmmgr::shmctl): Add support for an out shm_info buffer for the SHM_INFO command. (client_shmmgr::shmget): Use %X to print keys. * include/sys/ipc.h: Comment all fields and values. (IPC_PRIVATE): Change to be non-negative. * include/sys/msg.h: New file with SUSv3 and ipcs(8) interfaces. * include/sys/sem.h: Ditto. * include/sys/shm.h: Comment all fields and values. (struct shm_info): New struct. * cygserver_shm.h (client_request_shm::shminfo): Rename. (client_request_shm::shm_info): New method. (client_request_shm::_parameters.out.hFileMap): Move into union. (client_request_shm::_parameters.out.shminfo): Rename. (client_request_shm::_parameters.out.shm_info): New field. * cygserver_shm.cc (server_shmmgr::_shm_ids): Rename. (server_shmmgr::_shm_tot): New field. (server_shmmgr::shmctl): Rename `out_shminfo' argument. Add `out_shm_info' argument. Fill in the `out_shm_info' argument in the SHM_INFO command. (server_shmmgr::shmget): Check `shmflg' against the mode of existing segments as per Stevens 1990, p. 123. (server_shmmgr::server_shmmgr): Initialise the new `_shm_tot' field. (server_shmmgr::new_segment): Set ENOMEM if CreateFileMapping fails. Pass `size' to new_segment. (server_shmmgr::new_segment): Add size argument and use it to check against and update the new `_shm_tot' field. (server_shmmgr::delete_segment): Update the new `_shm_tot' field. * Makefile.in (DLL_OFILES): Add new DLL object files. 2002-07-09 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc: The main change is to make the client try harder to connect to the server if it's previously connected, and so has good grounds for believing that the server is running. (MAX_WAIT_NAMED_PIPE_RETRY): Change to be an enumerator. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::accept): Use interlocked operators on `pipe_instance'. (transport_layer_pipes::close): Rearrange so that FlushFileBuffers and DisconnectNamedPipe are only called for accepted endpoints. Use interlocked operators on `pipe_instance'. (transport_layer_pipes::read): Use set_errno where required. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Add local static variable `assume_cygserver'. Set it if a connection is made to cygserver, clear it if a connection is not made even after retrying. If set, ignore all errors from CreateFile and retry the connection. Catch the situation where WaitNamedPipe fails to wait [sic] and add a `Sleep (0)' so that the server gets a chance to run. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * dcrt0.cc: Only check for cygserver if and when required. (dll_crt0_1): Remove call to `cygserver_init ()'. * fhandler_tty.cc (fhandler_tty_slave::open): Change the cygserver logic to allow for the fact that `cygserver_init ()' may not yet have been called. (fhandler_tty_slave::cygserver_attach_tty): Tweak the cygserver request logic to conform to the practice elsewhere in the code. * tty.cc (tty::common_init): Add an explicit call to `cygserver_init ()' if it hasn't already been called. * include/cygwin/cygserver.h (CYGSERVER_UNAVAIL): Rename from `CYGSERVER_DEAD'. (client_request_get_version::check_version): Make available in cygserver as well the DLL. (check_cygserver_available): Ditto. Remove `check_version_too' argument. (cygserver_init): Ditto. And likewise. * cygserver_client.cc (client_request_get_version::check_version): Make available in cygserver as well the DLL. (client_request::make_request): This may now be called without `cygserver_init ()' having been called first. Detect this and call it as required. Add tracing. (check_cygserver_available): Make available in cygserver as well the DLL. Remove `check_version_too' argument and always check the version information. And since this is called from within `cygserver_init ()', force `cygserver_running' before calling `client_request::make_request ()'. (cygserver_init): Make available in cygserver as well the DLL. Remove `check_version_too' argument. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Implement the ipcs(8) interfaces, IPC_INFO, SHM_STAT and SHM_INFO. (server_shmmgr::segment_t::sequence): New static field. (server_shmmgr::segment_t::key): Remove field, use the new ds.shm_perm.key field instead. (server_shmmgr::segment_t::shmid): Remove field. (server_shmmgr::segment_t::intid): New field. (server_shmmgr::segment_t::segment_t): Use the `key' argument to initialise `ds.shm_perm.key'. Change from using `shmid' to `intid'. (server_shmmgr::_shmseg_cnt): Renamed from `_shmid_cnt'. (server_shmmgr::_intid_max): Renamed from `_shmid_max. (server_shmmgr::shmat): Move the out arguments to the start of the argument list. Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmctl): Add separate out arguments. Rename the `pid' argument as `cygpid'. Add support for the ipcs(8) interfaces. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmdt): Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmget): Add a separate out arguments. Rename the `pid' argument as `cygpid'. Add tracing. (server_shmmgr::server_shmmgr): Update for new field names. (server_shmmgr::find_by_key): Update for the new `ds.shm_perm.key' field. (server_shmmgr::find): Update to use the new `segment_t::intid' field. (server_shmmgr::new_segment): Rename the `pid' argument as `cygpid'. Check that the requested size is within bounds. Handle new error result from `new_segment (key, HANDLE)'. (server_shmmgr::new_segment): Work with intids, not shmids. Check that the new intid is within bounds. Update for new field names. (server_shmmgr::delete_segment): Pass an intid to `find ()', not a shmid. Update for new field names. (client_request_shm::serve): Check that the incoming message length is the size of the `_parameters.in' struct, not of the whole in/out parameter union. Likewise, set the outgoing message length to the size of the `_parameters.out' struct. Update for the new server_shmmgr interfaces. * include/sys/ipc.h (ipc_perm::key): New field. * include/sys/shm.h (SHM_INFO): New constant. * cygserver_ipc.h (IPCMNI): New constant. (ipc_int2ext): Add `sequence' argument and munge this into the external ipc id. (ipc_ext2int_subsys): Unmunge the sequence number from the external ipc id. (ipc_ext2int): Ditto. (ipc_inc_id): Remove. (ipc_dec_id): Remove. * cygserver_shm.h (SHMMAX): New constant. (SHMMIN): Ditto. (SHMMNI): Ditto. (SHMSEG): Ditto. (SHMALL): Ditto. (client_request_shm::_parameters): Re-arrange as a union of two separate structs, one for in arguments, the other for out. (client_request_shm::shmid): Update for the new parameter layout. (client_request_shm::ds): Ditto. (client_request_shm::info): New method. * shm.cc (client_shmmgr::_shmat_cnt): New static field. (client_shmmgr::shmat): Add locking. Add tracing. (client_shmmgr::shmctl): Update for ipcs(8) commands. Add tracing. Add more argument checking. (client_shmmgr::shmdt): Add locking. Add tracing. Update the new `_shmat_cnt' field. (client_shmmgr::shmget): Add tracing. (client_shmmgr::fixup_shms_after_fork): Add tracing. Add consistency checking. (client_shmmgr::attach): Add more tracing. (client_shmmgr::new_segment): Update the new `_shmat_cnt' field. (client_request_shm::client_request_shm): Update for the new parameter layout. Set the outgoing message length to the size of the `_parameters.in' struct, not of the whole in/out parameter union. 2002-07-02 Conrad Scott <conrad.scott@dsl.pipex.com> * shm.cc: Remove the use of a static client_shmmgr object. (client_shmmgr::_instance): New static variable. (client_shmmgr::instance): Allocate a new shmmgr on the heap, rather than using a local static object. 2002-07-01 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport.cc (create_server_transport): Fix cut-and-paste error. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Don't bother with the client request activity marker when compiled with debugging output. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (MAX_WAIT_NAMED_PIPE_RETRY): New constant. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::close): The `pipe' field is now either NULL or a valid handle, and it should never have the value `INVALID_HANDLE_VALUE'. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::connect): Ditto. New, but still bogus, retry logic. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::server_shmmgr): All fields have to be initialized now that the singleton is no longer static. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::_instance): New static field. (server_shmmgr::_instance_once): Ditto. (server_shmmgr::initialise_instance): New static method. (server_shmmgr::instance): Use a pthread_once_t rather than relying on a local static variable. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: Remove all uses of the C++ new and delete operators throughout cygserver until they are fully thread-safe. (safe_new0): New macro to replace the C++ new operator. (safe_new): Ditto. (safe_delete): New macro to replace the C++ delete operator. * cygserver_client.cc (client_request::handle_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::new_segment): Ditto. (server_shmmgr::delete_segment): Ditto. * cygserver_transport.cc (create_server_transport): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::accept): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. (threaded_queue::stop): Replace sleep(3) with win32 Sleep. * cygserver.cc (~server_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (server_submission_loop::request_loop): Ditto. (main): Ditto. Replace sleep(3) with win32 Sleep. Replace iostreams with FILEs. (print_usage): Replace iostreams with FILEs. (print_version): Ditto. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Rename local variable `accept_fd' to avoid shadowing the `fd' field. 2002-06-29 Conrad Scott <conrad.scott@dsl.pipex.com> * cygwin_ipc.h: Moved (back) to "include/sys/ipc.h". * cygwin_shm.h: Moved (back) to "include/sys/shm.h". * include/sys/ipc.h: New file. * include/sys/shm.h: New file. * cygserver_shm.h: Update for new header file locations. * ipc.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::make_request): Comment out a verbose tracing statement. * cygserver_process.cc (process_cache::sync_wait_array): Fix broken assert. * include/cygwin/cygserver.h (class client_request): Remove excess use of `class' qualifier in declarations. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_ipc.h: New file. * cygserver_shm.h: Re-written from scratch. * cygserver_shm.cc: Ditto. * shm.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * threaded_queue.h (class queue_request): Re-write. (threaded_queue_thread_function): Remove. (class queue_process_param): Remove. (class threaded_queue): Re-write. (class queue_submission_loop): New version of the old `queue_process_param' class. (TInterlockedExchangePointer): New templated function. (TInterlockedCompareExchangePointer): Ditto. * threaded_queue.cc (worker_function): Remove. (class threaded_queue): Re-write. (class queue_process_param): Remove. (class queue_submission_loop): New version of the old `queue_process_param' class. * include/cygwin/cygserver_process.h (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver_process.cc (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver.cc (request_count): Remove unused variable. (class server_request): Move methods inline. (class server_process_param): Remove. (class server_request_queue): Remove. (request_queue): Move into `main ()' and change type to `threaded_queue'. (request_loop): Remove. (class server_submission_loop): New version of the old `server_process_param' class. (shutdown_server): New variable. (client_request_shutdown::serve): Set `shutdown_server' to trigger shutdown. (handle_signal): Ditto. (main): Install signal handler for SIGINT rather than SIGQUIT. Use new interfaces for the `request_queue' and the `cache'. Create a `server_submission_loop' and add to the `request_queue'. Add check for the `shutdown_server' variable to the main loop. * cygserver_shm.cc (client_request_shm::serve): Release the process object after use. 2002-06-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Correct tracing statement. * cygserver_transport_pipes.cc: Remove local definition of FILE_FLAG_FIRST_PIPE_INSTANCE constant. * cygwin_ipc.h: Update copyright notice. * cygwin_shm.h: Ditto. * woutsup.h: Add definition of _WIN32_WINNT. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client (client_request::make_request): Replace my inappropriate use of set_errno () with error_code () throughout. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Add forward declarations of class transport_layer_base and class process_cache to reduce dependencies between header files. * include/cygwin/cygserver_process.h: Add include of "threaded_queue.h". * cygserver.cc: Remove unnecessary cygserver header files. * cygserver_client.cc: Ditto. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_shm.h: Ditto. * cygserver_transport_pipes.cc: Ditto. * dcrt0.cc: Ditto. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after merge from HEAD. * cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in merge from HEAD. * cygwin_shm.h: Ditto. 2002-06-21 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: The tests for a duplicate server instance are now the responsibility of the transport layer. (request_loop): Use new `recoverable' flag in call to `cygserver_transport::accept ()' and shutdown on an unrecoverable error. (main): Never call `cygserver_init ()'. Fake `cygserver_running' just for sending a shutdown request. * cygserver_client.cc (client_request::send): Comment out message-size tracing statements as verbose. (client_request::handle): Ditto. (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver.h (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver_transport.h (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. Add a `recoverable' out flag for error handling. * include/cygwin/cygserver_transport_sockets.h: Ditto. * include/cygwin/cygserver_transport_pipes.h: Ditto. (transport_layer_pipes): Change type of the `pipe_name' field. Remove the `inited' field, as unnecessary. Add new `is_accepted_endpoint' field. * include/cygwin/cygserver_transport.cc (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.cc (transport_layer_sockets::listen): #ifdef as cygserver-only. (transport_layer_sockets::accept): #ifdef as cygserver-only. Analyse any errno from `accept ()' and set `recoverable' as appropriate. * cygserver_transport_pipes.cc: Add local #define of `FILE_FLAG_FIRST_PIPE_INSTANCE'. (pipe_instance_lock_once): New variable. (pipe_instance_lock): Ditto. (pipe_instance): Ditto. (initialise_pipe_instance_lock): New function. (transport_layer_pipes::transport_layer_pipes): Change initialization of `pipe_name'. Initialize `is_accepted_endpoint' as appropriate. Remove use of `inited'. (transport_layer_pipes::impersonate_client): #ifdef as cygserver-only. (transport_layer_pipes::revert_to_self): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. Keep track of how often many named pipes have been created, in the `pipe_instance' variable, and pass the `FILE_FLAG_FIRST_PIPE_INSTANCE' flag on the open of the first instance. Analyse the error code from `CreateNamedPipe ()' and set the `recoverable' flag as appropriate. (transport_layer_pipes::close): Update the `pipe_instance' count. 2002-06-18 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h (cygserver_running): Add declaration. (api_fatal): Eliminate. * include/cygwin/cygserver.h (client_request_get_version::check_version): Change return type to bool. (check_cygserver_available): New function. (cygserver_init): Add check_version_too argument. * cygserver_client.cc (allow_daemon): Make a bool. (client_request_get_version::make_request): See errno on error. Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now handled in cygserver_init(). (client_request_get_version::check_version): Use syscall_printf() instead of api_fatal(). Return true if cygserver version is compatible. (check_cygserver_available): New function; code moved here from cygserver_init(). (cygserver_init): Move some code into check_cygserver_available(). * cygserver.cc (__set_errno): Copy from debug.cc so that set_errno() can be used when __OUTSIDE_CYGWIN__. (main): Call cygserver_init() to set up cygserver_running and add checks against this to (try and) prevent multiple copies of cygserver running simultaneously. Remember to delete all transport connections so that (one day) the transport classes can tidy up on cygserver shutdown. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (main): Adjust tracing output for a cleaner display when compiled without --enable-debugging. * threaded_queue.cc (threaded_queue::cleanup): Ditto. (queue_process_param::stop): Ditto. * include/cygwin/cygserver.h (client_request::make_request): Make non-virtual. (client_request::send): Make virtual and protected, not private. (client_request_attach_tty::send): New virtual method. * cygserver_client.cc: Use the `msglen()' accessor rather than `_header.msglen' throughout. (client_request_attach_tty::send): New method. (client_request::make_request): Remove the explicit close of `transport' as it is closed on deletion. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Change the client_request classes to give greater encapsulation and to allow variable length requests and replies. (enum cygserver_request_code): Now client_request::request_code_t. (class request_header): Now client_request::header_t. Make a union of the request_code and the error_code. The `cb' field, which was the buffer length, is now the `size_t msglen' field. (struct request_get_version): Now client_request_get_version::request_get_version. (struct request_shutdown): Remove unused type. (struct request_attach_tty): Now client_request_attach_tty::request_attach_tty. (client_request::_buf): Make field const. (client_request::_buflen): New const private field. (client_request::request_code): New accessor. (client_request::error_code): Ditto. (client_request::msglen): Ditto. (client_request::handle_request): New static method. (client_request::make_request): New virtual method. (client_request::handle): New method. (client_request::send): Make private. (client_request_get_version::check_version): New method. (client_request_get_version::serve): Make private. (client_request_get_version::version): Ditto. (client_request_shutdown::serve): Ditto. (client_request_attach_tty::req): Ditto. (client_request_attach_tty::serve): Ditto. (client_request_attach_tty::from_master): Make method const. (client_request_attach_tty::from_master): Ditto. * cygserver_client.cc (client_request_get_version::client_request_get_version): Track changes to the client_request classes. (client_request_attach_tty::client_request_attach_tty): Ditto. (client_request_get_version::check_version): New method to encapsulate code from cygserver_init(). (client_request_shutdown::client_request_shutdown): Move into "cygserver.cc". (client_request::send): Track changes to the client_request classes. Add more error checking. (client_request::handle_request): New static method containing the first half of the old server_request::process() code. (client_request::make_request): New method to replace the old cygserver_request() function. (client_request::handle): New method containing the second half of the old server_request::process() code. (cygserver_init): Track changes to the client_request classes. In particular, some code moved into the client_request_get_version::check_version() method. * cygserver.cc (client_request_attach_tty::serve): Track changes to the client_request classes. In particular, only return a reply body if some handles are successfully duplicated for the client. And remove goto's. (client_request_get_version::serve): Track changes to the client_request classes. (client_request_shutdown::serve): Ditto. (class client_request_invalid): Dead, and so young too. (server_request::request_buffer): Remove unnecessary field. (client_request_shutdown::client_request_shutdown): Moved here from "cygserver_client.cc". (server_request::process): Implementation moved into the new client_request::handle_request() and client_request::handle() methods. * cygserver_shm.h (class client_request_shm): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. (client_request_shm::serve): Make private. * cygserver_shm.cc (client_request_shm::client_request_shm): Track changes to the client_request classes. (client_request_shm::serve): Ditto * shm.cc (client_request_shm::client_request_shm): Ditto. Use alloc_sd() rather than set_security_attribute() to get access to the SECURITY_DESCRIPTOR length, so that we can use it to set the request body length. (shmat): Track changes to the client_request classes. In particular, allocate client_request objects on the stack rather than on the heap, and use the client_request::make_request() method rather than the old cygserver_request() function. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. * fhandler_tty.cc (fhandler_tty_slave::cygserver_attach_tty): Ditto. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (cygserver_transport::read): Change buffer type to void *. (cygserver_transport::write): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::read): Ditto. (cygserver_transport_pipes::write): Ditto. * cygserver_transport_sockets.cc (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * cygserver_transport_pipes.cc (cygserver_transport_pipes::read): Ditto. Set errno on error, to match behaviour of cygserver_transport_sockets class. (cygserver_transport_pipes::write): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (version): New static variable. (server_request_queue::add_connection): Remove my gratuitous use of studly caps. (setup_privileges): Declare static. (handle_signal): Ditto. (longopts): Make a local variable of main(). (opts): Ditto. (print_usage): New function. (print_version): Ditto (tip of the hat to Joshua Daniel Franklin for inspiration here). (main): More argument checking. Add --help and --version options. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::serve): Make pure virtual. * cygserver.cc (client_request::serve): Remove definition of pure virtual method. (class client_request_invalid): New class. (server_request::process): Use new client_request_invalid class. And remove goto's. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (class server_request): Add virtual destructor. (server_request_queue::addConnection): New method to replace bad virtual add() method. (request_loop): Replace call to queue->add() with call to queue->addConnection(). (server_request::server_request): Use field initialization. (server_request::~server_request): New virtual destructor. (server_request::process): Remove close and delete of transport_layer_base object. It is deleted by the server_request's own destructor and closed by its own destructor. * include/cygwin/cygserver.h (client_request::operator request_header): Remove unused method. * cygserver_client.cc: Ditto. * include/cygwin/cygserver_process.h (class cleanup_routine): Add virtual destructor. (cleanup_routine::cleanup): Make pure virtual. (class process_cache): Make destructor non-virtual. (process_cache::add): Ditto. * cygserver_process.cc (cleanup_routine::~cleanup_routine): New virtual destructor. * include/cygwin/cygserver_transport.h (class transport_layer_base): Add virtual destructor. * cygserver_transport.cc (transport_layer_base::~transport_layer_base): New virtual destructor. * include/cygwin/cygserver_transport_pipes.h (class transport_layer_pipes): Add virtual destructor. * cygserver_transport_pipes.cc (transport_layer_pipes::~transport_layer_pipes): New virtual destructor. (transport_layer_pipes::close): Null out handle after closing. * include/cygwin/cygserver_transport_sockets.h (class transport_layer_sockets): Add virtual destructor. * cygserver_transport_sockets.cc (transport_layer_sockets::~transport_layer_sockets): New virtual destructor. (transport_layer_sockets::close): Null out fd after closing. * threaded_queue.h (class queue_request): Add virtual destructor. (queue_request::process): Make pure virtual. * threaded_queue.cc (~queue_request): New virtual destructor. (queue_request::process): Remove definition of pure virtual method. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::send): Make non-virtual. (class client_request_attach_tty): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. * cygserver_client.cc: Ditto. (cygserver_init): Fix error handling. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: Throughout the code, check and correct level of the XXX_printf() functions used. Comment out several of the debug_printf() calls with "// verbose:". Reformat and correct typos of some of the XXX_printf() formats. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * shm.cc (hi_ulong): New function to allow printing of a 64-bit key with current small_printf implementation. (lo_ulong): Ditto. (client_request_shm::client_request_shm): Use hi_ulong() and lo_ulong() in call to debug_printf(). 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Remove #define __INSIDE_CYGWIN__ from around <sys/shm.h> as it no longer contains any internal code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h (IPC_PRIVATE): Add cast to key_t. (IPC_INFO): New flag for ipcs(8). (IPC_RMID IPC_SET IPC_STAT): Renumber. * include/sys/shm.h (SHM_RDONLY SHM_RND): Renumber with distinct values [sic]. (class _shmattach): Internal type moved to "cygserver_shm.h". (class shmnode): Ditto. (class shmid_ds): Ditto. (struct shmid_ds): Add spare fields. (struct shminfo): New type for IPC_INFO interface. * cygserver_shm.h: Remove obsolete #if 0 ... #endif block. (class shm_cleanup): Remove unused class. (struct _shmattach): Internal type moved from <sys/shm.h>. (struct shmnode): Ditto. (struct int_shmid_ds): Ditto. Renamed to avoid name clash with public interface struct shmid_ds. Use the shmid_bs structure as a field. * cygserver_shm.cc: Remove obsolete #if 0 ... #endif block. (client_request_shm::serve): Update for redefinition of int_shmid_ds structure. * shm.cc (build_inprocess_shmds): Ditto. (fixup_shms_after_fork): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove obsolete #if 0 ... #endif code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Make a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport.cc (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Remove since it is now a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (check_and_dup_handle): Only use security code if running on NT, i.e. if wincap.has_security(). (client_request_attach_tty::serve): Add check for has_security(). * cygserver_process.cc (process_cache::process): Use DWORD winpid throughout to avoid win32 vs. cygwin pid confusion. (process::process): Ditto. * cygserver_shm.cc (client_request_shm::serve): Only use security code if running on NT, i.e. if wincap.has_security(). * cygserver_shm.h (client_request_shm::parameters.in): Replace the ambiguous pid field with cygpid and winpid fields. (client_request_shm::client_request_shm): Reduce to only two client-side constructors: one for SHM_CREATE, another for all the other requests. * shm.cc (client_request_shm::client_request_shm): Ditto. Initialize cygpid and winpid fields here. On NT initialize sd_buf here using set_security_attribute() to make use of the euid and egid. (shmat): Use new client_request_shm constructor. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove security code, now performed in the relevant client_request_shm constructor. * include/cygwin/cygserver_process.h: (class cleanup_routine): Change winpid type to DWORD. (class process): Ditto. 2002-06-15 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: New file. * cygserver.cc: Use "woutsup.h" and new XXX_printf macros. (getfunc): New function, copied verbatim from "strace.cc". (__cygserver__printf): New function. * cygserver_client.cc: Use "woutsup.h" and new XXX_printf macros. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * threaded_queue.cc: Ditto. * shm.cc: Remove trailing \n from XXX_printf format strings. * Makefile.in: Remove special __OUTSIDE_CYGWIN__ case for cygserver_shm.cc.
2002-09-22 14:04:15 +02:00
if (
#ifdef USE_SERVER
cygserver_running != CYGSERVER_OK &&
#endif
!SetKernelObjectSecurity (hMainProc,
2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> GNUify non-GNU formatted functions calls throughout. 2002-09-22 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Remove macro. (server_shmmgr::segment_t::~segment_t): Remove calls to with_strerr. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::new_segment): Ditto. * shm.cc (with_strerr): Remove macro. (client_shmmgr::shmdt): Remove calls to with_strerr. (client_shmmgr::attach): Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h: Move to "include/cygwin/ipc.h". * include/sys/msg.h: Move to "include/cygwin/msg.h". * include/sys/sem.h: Move to "include/cygwin/sem.h". * include/sys/shm.h: Move to "include/cygwin/shm.h". * include/cygwin/ipc.h: New file. * include/cygwin/msg.h: Ditto. * include/cygwin/sem.h: Ditto. * include/cygwin/shm.h: Ditto. * cygserver_shm.h: Update includes. * msg.cc: Ditto. * sem.cc: Ditto. 2002-09-21 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h (safe_delete): Make a templated function. * cygserver.cc (~server_request): Update use of safe_delete. (main): Ditto. * cygserver_client.cc (client_request::handle_request): Ditto. (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::remove): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. * cygserver_shm.cc (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::delete_segment): Ditto. * shm.cc (client_shmmgr::shmdt): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. 2002-08-29 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Replace #include <new> with an explicit definition of the placement new operator. (safe_delete): Remove unnecessary ## operator. 2002-07-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr): Remove `cleanup_t' friend declaration. (cleanup_t::cleanup_t): Use the segment's shmid as the key rather than the segment pointer itself. (cleanup_t::segptr): Remove method. (cleanup_t::shmid): New method. (cleanup_t::cleanup): Update for new key value. (server_shmmgr::find (segment_t *)): Remove method. * include/cygwin/cygserver_process.h (cleanup_routine::key): Make method const. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_process.h (cleanup_routine::_key): New field. (cleanup_routine::cleanup_routine): Initialise new field with new argument. (cleanup_routine::operator==): New method. (cleanup_routine::key): New method. (cleanup_routine::cleanup): Make argument non-const. (process::is_active): New method. (process::remove): Ditto. (process::check_exit_code): Rename method. * cygserver_process.cc (process::add): Reorganize code. (process::remove): New method. (process::check_exit_code): Rename method. (process::cleanup): Use new `process::is_active' method. (process_cache::process): Ditto. (process_cache::sync_wait_array): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr): Make `cleanup_t' a friend. (segment_t::detach): Make argument non-const. Remove cleanup object from client if appropriate. (cleanup_t::_segptr): Remove field. (cleanup_t::cleanup_t): Initialise parent explicitly. Remove field. (cleanup_t::segptr): New method. (cleanup_t::cleanup): Add error checking and reporting. (server_shmmgr::shmdt): Make argument non-const. (server_shmmgr::find (segment_t *)): New method. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::client_request_shutdown): Comment out verbose tracing statement. * cygserver_client.cc (client_request_get_version::client_request_get_version): Ditto. (client_request_attach_tty::client_request_attach_tty): Ditto. * cygserver_shm.cc (client_request_shm::client_request_shm): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::listen): Set `_is_listening_endpoint' appropriately. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::listen): Change return type. (transport_layer_base::connect): Ditto. * include/cygwin/cygserver_transport_pipes.h (transport_layer_pipes::listen): Change return type. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::_sec_none_nih): Remove unused field. (transport_layer_pipes::_is_listening_endpoint): New field. * cygserver_transport_pipes.cc: Synchronize with sockets code. (transport_layer_pipes::transport_layer_pipes): Initialise new field. Separate out asserts. (transport_layer_pipes::listen): Change return type. Add asserts. (transport_layer_pipes::accept): Add asserts. (transport_layer_pipes::read): Change conditional to an assert. Add assert. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Change return type. Change conditional to an assert. Add asserts. Rationalize error code slightly. (transport_layer_pipes::impersonate_client): Add asserts. * include/cygwin/cygserver_transport_sockets.h (transport_layer_sockets::listen): Change return type. (transport_layer_sockets::connect): Ditto. (transport_layer_sockets::_addr): Change type of field. (transport_layer_sockets::_addr_len): Ditto. (transport_layer_sockets::_is_accepted_endpoint): New field. (transport_layer_sockets::_is_listening_endpoint): Ditto. * cygserver_transport_sockets.cc (MAX_CONNECT_RETRY): New constant. (transport_layer_sockets::transport_layer_sockets): Initialise new fields. Only initialise the socket address where necessary. (transport_layer_sockets::listen): Change return type. Rewrite. (transport_layer_sockets::accept): Add asserts. Add tracing statements. Use a local variable to hold the accepted address. (transport_layer_sockets::close): Add tracing statements. Unlink the UNIX domain socket file as appropriate. Close the socket cleanly. (transport_layer_sockets::read): Rewrite method. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Change return type. Rewrite. * cygserver.cc (server_submission_loop::request_loop): Run the listening thread at high priority with special handling for shutdown. (main): Print the request error code rather than errno in shutdown request code. Install signal handlers with sigaction(2) to avoid setting SA_RESTART. Check value of the listen method call, now it has one. * cygserver_client.cc (client_request::make_request): Check new return value on connect method call. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::_sd): Rename field. (cygserver_transport_pipes::_sec_none_nih): Ditto. (cygserver_transport_pipes::_sec_all_nih): Ditto. (cygserver_transport_pipes::_pipe_name): Ditto. (cygserver_transport_pipes::_hPipe): Ditto. (cygserver_transport_pipes::_is_accepted_endpoint): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Rename fields. (transport_layer_pipes::init_security): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. (transport_layer_pipes::close): Ditto. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::_fd): Rename field. (cygserver_transport_sockets::_addr): Ditto. (cygserver_transport_sockets::_addr_len): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::transport_layer_sockets): Rename fields. (transport_layer_sockets::listen): Ditto. (transport_layer_sockets::accept): Ditto. (transport_layer_sockets::close): Ditto. (transport_layer_sockets::read): Ditto. (transport_layer_sockets::write): Ditto. (transport_layer_sockets::connect): Ditto. 2002-07-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (with_strerr): Fix use of %p format. * shm.cc (client_shmmgr::shmat): Ditto. (client_shmmgr::shmctl): Ditto. (client_shmmgr::shmdt): Ditto. (client_shmmgr::attach): Ditto. 2002-07-14 Christopher Faylor <cgf@redhat.com> * woutsup.h (system_printf): Remove extraneous semicolon from macro definition. 2002-07-14 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (transport_layer_pipes::connect): Use ProtectHandle in DLL code. (transport_layer_pipes::close): Use ForceCloseHandle in DLL code. 2002-07-13 Nicholas Wourms <nwourms@netscape.com> * threaded_queue.h (class queue_submission_loop): Correct friend declaration for GCC 3.1.1. * include/cygwin/cygserver_process.h (class process): Ditto. (class process_cache): Ditto. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::shmdt): Only call delete_segment if the segment exists [sic]. 2002-07-12 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: Include <new> rather than <new.h> for gcc 3. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * safe_memory.h: New file extracted from "woutsup.h". * woutsup.h: Move the "safe" new/delete macros into the new "safe_memory.h" header file and include that here. * cygserver_client.cc: Explicitly include "safe_memory.h" for client-side code. (client_request::make_request): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * cygserver_transport.cc: Explicitly include "safe_memory.h" for client-side code. (create_server_transport): Use the "safe" new/delete macros unconditionally, i.e. use them on the client side as well as on the server side. * shm.cc: Include "safe_memory.h". (client_shmmgr::instance): Use the "safe" new/delete macros. (client_shmmgr::shmdt): Ditto. (client_shmmgr::new_segment): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_process (process::process): Add the client's cygpid and winpid to all tracing statements as appropriate. (process::exit_code): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::shmat): Ditto. (server_shmmgr::shmdt): Ditto. (server_shmmgr::shmctl): Add a process object argument and remove the explicit cygpid argument. Add the client's cygpid and winpid to all tracing statements as appropriate. (server_shmmgr::shmget): Ditto. (client_request_shm::serve): Update for the new signature of the shmctl and shmget methods. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (client_request_shutdown::serve): Don't set the shutdown flag directly, but send a SIGINT, as the signal handler sets the flag and the signal breaks the pause(2) in the main loop. (print_usage): Add new options. (main): Add new --cleanup-threads and --request-threads options to set the number of threads used by the daemon. Use pause(2) rather the win32 Sleep in the main loop. * shm.cc (shmat): Add sigframe. (shmctl): Ditto. (shmdt): Ditto. (shmget): Ditto. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Automatically detach processes from any segments they are attached to at exit. (class server_shmmgr::attach_t): New class. (server_shmmgr::segment_t::IS_DELETED): Rename and make private. (server_shmmgr::segment_t::_sequence): Make private. (server_shmmgr::segment_t::_flg): Ditto. (server_shmmgr::segment_t::_hFileMap): Ditto. (server_shmmgr::segment_t::_attach_head): New private field. (server_shmmgr::segment_t::segment_t): Initialise new fields. Make non-inline. (server_shmmgr::segment_t::~segment_t): New method. (server_shmmgr::segment_t::is_deleted): Ditto. (server_shmmgr::segment_t::is_pending_delete): Ditto. (server_shmmgr::segment_t::mark_deleted): Ditto. (server_shmmgr::segment_t::attach): Ditto. (server_shmmgr::segment_t::detach): Ditto. (server_shmmgr::segment_t::find): Ditto. (class server_shmmgr::cleanup_t): New class. (server_shmmgr::_shm_atts): New private field. (server_shmmgr::shmat): Add a process object argument to replace the removed process_cache, cygpid and winpid arguments. Remove the process_cache manipulations. Move body of code to the segment_t::attach method. Increment _shm_atts when required. Update tracing statements. (server_shmmgr::shmdt): Add a process object argument to replace the removed cygpid argument. Move body of code to the segment_t::detach method. Decrement _shm_atts when required. Update tracing statements. (server_shmmgr::shmget): Use the new segment_t::is_deleted method. (server_shmmgr::server_shmmgr): Initialise the new _shm_atts field. (server_shmmgr::delete_segment): Remove the CloseHandle code, as this is now done in the segment_t destructor. (client_request_shm::serve): Look up the client's process object and pass to the server_shmmgr::shmat and server_shmmgr::shmdt methods rather than passing the cache, winpid and cygpid. * cygserver_process.h: Add a cygpid to the process object to make it more useful and then pass process objects rather than winpids where possible. (cleanup_routine::cleanup): Change argument to be a pointer to a process object. (class process): Re-order fields for no discernible reason. (process::_cygpid): New field. (process::process): Add a cygpid argument. (process::winpid): New method. (process::cygpid): Ditto. (process::add): Make public, as it always should have been. (process_cache::process): Add a cygpid argument. * cygserver_process.cc (process::process): Add a cygpid argument and use it to initialise the `_cygpid' field. Re-order initialisers to match new field order. (process::cleanup): Pass `this' rather than just the winpid to cleanup_routine::cleanup. (process_cache::process): Add a cygpid argument and pass it to the process object constructor. * include/sys/shm.h (shmatt_t): Make unsigned as per SUSv3. (shm_info::shm_atts): New field. 2002-07-11 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (class server_shmmgr::segment_t): Add `_' prefix to the names of all fields. 2002-07-10 Conrad Scott <conrad.scott@dsl.pipex.com> * msg.cc: New file of stub functions, no functionality. * sem.cc: Ditto. * shm.cc (client_shmmgr::shmctl): Add support for an out shm_info buffer for the SHM_INFO command. (client_shmmgr::shmget): Use %X to print keys. * include/sys/ipc.h: Comment all fields and values. (IPC_PRIVATE): Change to be non-negative. * include/sys/msg.h: New file with SUSv3 and ipcs(8) interfaces. * include/sys/sem.h: Ditto. * include/sys/shm.h: Comment all fields and values. (struct shm_info): New struct. * cygserver_shm.h (client_request_shm::shminfo): Rename. (client_request_shm::shm_info): New method. (client_request_shm::_parameters.out.hFileMap): Move into union. (client_request_shm::_parameters.out.shminfo): Rename. (client_request_shm::_parameters.out.shm_info): New field. * cygserver_shm.cc (server_shmmgr::_shm_ids): Rename. (server_shmmgr::_shm_tot): New field. (server_shmmgr::shmctl): Rename `out_shminfo' argument. Add `out_shm_info' argument. Fill in the `out_shm_info' argument in the SHM_INFO command. (server_shmmgr::shmget): Check `shmflg' against the mode of existing segments as per Stevens 1990, p. 123. (server_shmmgr::server_shmmgr): Initialise the new `_shm_tot' field. (server_shmmgr::new_segment): Set ENOMEM if CreateFileMapping fails. Pass `size' to new_segment. (server_shmmgr::new_segment): Add size argument and use it to check against and update the new `_shm_tot' field. (server_shmmgr::delete_segment): Update the new `_shm_tot' field. * Makefile.in (DLL_OFILES): Add new DLL object files. 2002-07-09 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc: The main change is to make the client try harder to connect to the server if it's previously connected, and so has good grounds for believing that the server is running. (MAX_WAIT_NAMED_PIPE_RETRY): Change to be an enumerator. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::accept): Use interlocked operators on `pipe_instance'. (transport_layer_pipes::close): Rearrange so that FlushFileBuffers and DisconnectNamedPipe are only called for accepted endpoints. Use interlocked operators on `pipe_instance'. (transport_layer_pipes::read): Use set_errno where required. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Add local static variable `assume_cygserver'. Set it if a connection is made to cygserver, clear it if a connection is not made even after retrying. If set, ignore all errors from CreateFile and retry the connection. Catch the situation where WaitNamedPipe fails to wait [sic] and add a `Sleep (0)' so that the server gets a chance to run. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * dcrt0.cc: Only check for cygserver if and when required. (dll_crt0_1): Remove call to `cygserver_init ()'. * fhandler_tty.cc (fhandler_tty_slave::open): Change the cygserver logic to allow for the fact that `cygserver_init ()' may not yet have been called. (fhandler_tty_slave::cygserver_attach_tty): Tweak the cygserver request logic to conform to the practice elsewhere in the code. * tty.cc (tty::common_init): Add an explicit call to `cygserver_init ()' if it hasn't already been called. * include/cygwin/cygserver.h (CYGSERVER_UNAVAIL): Rename from `CYGSERVER_DEAD'. (client_request_get_version::check_version): Make available in cygserver as well the DLL. (check_cygserver_available): Ditto. Remove `check_version_too' argument. (cygserver_init): Ditto. And likewise. * cygserver_client.cc (client_request_get_version::check_version): Make available in cygserver as well the DLL. (client_request::make_request): This may now be called without `cygserver_init ()' having been called first. Detect this and call it as required. Add tracing. (check_cygserver_available): Make available in cygserver as well the DLL. Remove `check_version_too' argument and always check the version information. And since this is called from within `cygserver_init ()', force `cygserver_running' before calling `client_request::make_request ()'. (cygserver_init): Make available in cygserver as well the DLL. Remove `check_version_too' argument. 2002-07-03 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Implement the ipcs(8) interfaces, IPC_INFO, SHM_STAT and SHM_INFO. (server_shmmgr::segment_t::sequence): New static field. (server_shmmgr::segment_t::key): Remove field, use the new ds.shm_perm.key field instead. (server_shmmgr::segment_t::shmid): Remove field. (server_shmmgr::segment_t::intid): New field. (server_shmmgr::segment_t::segment_t): Use the `key' argument to initialise `ds.shm_perm.key'. Change from using `shmid' to `intid'. (server_shmmgr::_shmseg_cnt): Renamed from `_shmid_cnt'. (server_shmmgr::_intid_max): Renamed from `_shmid_max. (server_shmmgr::shmat): Move the out arguments to the start of the argument list. Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmctl): Add separate out arguments. Rename the `pid' argument as `cygpid'. Add support for the ipcs(8) interfaces. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmdt): Rename the `pid' argument as `cygpid'. Add tracing. Pass an intid to `find ()', not a shmid. (server_shmmgr::shmget): Add a separate out arguments. Rename the `pid' argument as `cygpid'. Add tracing. (server_shmmgr::server_shmmgr): Update for new field names. (server_shmmgr::find_by_key): Update for the new `ds.shm_perm.key' field. (server_shmmgr::find): Update to use the new `segment_t::intid' field. (server_shmmgr::new_segment): Rename the `pid' argument as `cygpid'. Check that the requested size is within bounds. Handle new error result from `new_segment (key, HANDLE)'. (server_shmmgr::new_segment): Work with intids, not shmids. Check that the new intid is within bounds. Update for new field names. (server_shmmgr::delete_segment): Pass an intid to `find ()', not a shmid. Update for new field names. (client_request_shm::serve): Check that the incoming message length is the size of the `_parameters.in' struct, not of the whole in/out parameter union. Likewise, set the outgoing message length to the size of the `_parameters.out' struct. Update for the new server_shmmgr interfaces. * include/sys/ipc.h (ipc_perm::key): New field. * include/sys/shm.h (SHM_INFO): New constant. * cygserver_ipc.h (IPCMNI): New constant. (ipc_int2ext): Add `sequence' argument and munge this into the external ipc id. (ipc_ext2int_subsys): Unmunge the sequence number from the external ipc id. (ipc_ext2int): Ditto. (ipc_inc_id): Remove. (ipc_dec_id): Remove. * cygserver_shm.h (SHMMAX): New constant. (SHMMIN): Ditto. (SHMMNI): Ditto. (SHMSEG): Ditto. (SHMALL): Ditto. (client_request_shm::_parameters): Re-arrange as a union of two separate structs, one for in arguments, the other for out. (client_request_shm::shmid): Update for the new parameter layout. (client_request_shm::ds): Ditto. (client_request_shm::info): New method. * shm.cc (client_shmmgr::_shmat_cnt): New static field. (client_shmmgr::shmat): Add locking. Add tracing. (client_shmmgr::shmctl): Update for ipcs(8) commands. Add tracing. Add more argument checking. (client_shmmgr::shmdt): Add locking. Add tracing. Update the new `_shmat_cnt' field. (client_shmmgr::shmget): Add tracing. (client_shmmgr::fixup_shms_after_fork): Add tracing. Add consistency checking. (client_shmmgr::attach): Add more tracing. (client_shmmgr::new_segment): Update the new `_shmat_cnt' field. (client_request_shm::client_request_shm): Update for the new parameter layout. Set the outgoing message length to the size of the `_parameters.in' struct, not of the whole in/out parameter union. 2002-07-02 Conrad Scott <conrad.scott@dsl.pipex.com> * shm.cc: Remove the use of a static client_shmmgr object. (client_shmmgr::_instance): New static variable. (client_shmmgr::instance): Allocate a new shmmgr on the heap, rather than using a local static object. 2002-07-01 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport.cc (create_server_transport): Fix cut-and-paste error. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Don't bother with the client request activity marker when compiled with debugging output. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_pipes.cc (MAX_WAIT_NAMED_PIPE_RETRY): New constant. (WAIT_NAMED_PIPE_TIMEOUT): Ditto. (transport_layer_pipes::close): The `pipe' field is now either NULL or a valid handle, and it should never have the value `INVALID_HANDLE_VALUE'. (transport_layer_pipes::read): Ditto. (transport_layer_pipes::write): Ditto. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Ditto. (transport_layer_pipes::connect): Ditto. New, but still bogus, retry logic. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::server_shmmgr): All fields have to be initialized now that the singleton is no longer static. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc (server_shmmgr::_instance): New static field. (server_shmmgr::_instance_once): Ditto. (server_shmmgr::initialise_instance): New static method. (server_shmmgr::instance): Use a pthread_once_t rather than relying on a local static variable. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: Remove all uses of the C++ new and delete operators throughout cygserver until they are fully thread-safe. (safe_new0): New macro to replace the C++ new operator. (safe_new): Ditto. (safe_delete): New macro to replace the C++ delete operator. * cygserver_client.cc (client_request::handle_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (client_request::make_request): Ditto. * cygserver_process.cc (~process_cleanup): Ditto. (process::cleanup): Ditto. (process_cache::process): Ditto. (process_cache::check_and_remove_process): Ditto. * cygserver_shm.cc (server_shmmgr::new_segment): Ditto. (server_shmmgr::delete_segment): Ditto. * cygserver_transport.cc (create_server_transport): Ditto. * cygserver_transport_pipes.cc (transport_layer_pipes::accept): Ditto. * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Ditto. * threaded_queue.cc (~threaded_queue): Ditto. (threaded_queue::worker_loop): Ditto. (threaded_queue::stop): Replace sleep(3) with win32 Sleep. * cygserver.cc (~server_request): Replace all uses of the C++ new and delete operators with the new macros from "woutsup.h". (server_submission_loop::request_loop): Ditto. (main): Ditto. Replace sleep(3) with win32 Sleep. Replace iostreams with FILEs. (print_usage): Replace iostreams with FILEs. (print_version): Ditto. 2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_transport_sockets.cc (transport_layer_sockets::accept): Rename local variable `accept_fd' to avoid shadowing the `fd' field. 2002-06-29 Conrad Scott <conrad.scott@dsl.pipex.com> * cygwin_ipc.h: Moved (back) to "include/sys/ipc.h". * cygwin_shm.h: Moved (back) to "include/sys/shm.h". * include/sys/ipc.h: New file. * include/sys/shm.h: New file. * cygserver_shm.h: Update for new header file locations. * ipc.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::make_request): Comment out a verbose tracing statement. * cygserver_process.cc (process_cache::sync_wait_array): Fix broken assert. * include/cygwin/cygserver.h (class client_request): Remove excess use of `class' qualifier in declarations. (class client_request_get_version): Ditto. (class client_request_shutdown): Ditto. (class client_request_attach_tty): Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_ipc.h: New file. * cygserver_shm.h: Re-written from scratch. * cygserver_shm.cc: Ditto. * shm.cc: Ditto. 2002-06-28 Conrad Scott <conrad.scott@dsl.pipex.com> * threaded_queue.h (class queue_request): Re-write. (threaded_queue_thread_function): Remove. (class queue_process_param): Remove. (class threaded_queue): Re-write. (class queue_submission_loop): New version of the old `queue_process_param' class. (TInterlockedExchangePointer): New templated function. (TInterlockedCompareExchangePointer): Ditto. * threaded_queue.cc (worker_function): Remove. (class threaded_queue): Re-write. (class queue_process_param): Remove. (class queue_submission_loop): New version of the old `queue_process_param' class. * include/cygwin/cygserver_process.h (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver_process.cc (process_cleanup): Re-write. (class process_process_param): Remove. (class cleanup_routine): Re-write. (class process): Re-write. (class process_cache): Re-write. * cygserver.cc (request_count): Remove unused variable. (class server_request): Move methods inline. (class server_process_param): Remove. (class server_request_queue): Remove. (request_queue): Move into `main ()' and change type to `threaded_queue'. (request_loop): Remove. (class server_submission_loop): New version of the old `server_process_param' class. (shutdown_server): New variable. (client_request_shutdown::serve): Set `shutdown_server' to trigger shutdown. (handle_signal): Ditto. (main): Install signal handler for SIGINT rather than SIGQUIT. Use new interfaces for the `request_queue' and the `cache'. Create a `server_submission_loop' and add to the `request_queue'. Add check for the `shutdown_server' variable to the main loop. * cygserver_shm.cc (client_request_shm::serve): Release the process object after use. 2002-06-27 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client.cc (client_request::handle_request): Correct tracing statement. * cygserver_transport_pipes.cc: Remove local definition of FILE_FLAG_FIRST_PIPE_INSTANCE constant. * cygwin_ipc.h: Update copyright notice. * cygwin_shm.h: Ditto. * woutsup.h: Add definition of _WIN32_WINNT. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_client (client_request::make_request): Replace my inappropriate use of set_errno () with error_code () throughout. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Add forward declarations of class transport_layer_base and class process_cache to reduce dependencies between header files. * include/cygwin/cygserver_process.h: Add include of "threaded_queue.h". * cygserver.cc: Remove unnecessary cygserver header files. * cygserver_client.cc: Ditto. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_shm.h: Ditto. * cygserver_transport_pipes.cc: Ditto. * dcrt0.cc: Ditto. * fhandler_tty.cc: Ditto. * tty.cc: Ditto. 2002-06-24 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after merge from HEAD. * cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in merge from HEAD. * cygwin_shm.h: Ditto. 2002-06-21 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: The tests for a duplicate server instance are now the responsibility of the transport layer. (request_loop): Use new `recoverable' flag in call to `cygserver_transport::accept ()' and shutdown on an unrecoverable error. (main): Never call `cygserver_init ()'. Fake `cygserver_running' just for sending a shutdown request. * cygserver_client.cc (client_request::send): Comment out message-size tracing statements as verbose. (client_request::handle): Ditto. (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver.h (client_request_get_version::check_version): #ifdef as DLL-only. (check_cygserver_available): Ditto. (cygserver_init): Ditto. * include/cygwin/cygserver_transport.h (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. (transport_layer_base::listen): Ditto. (transport_layer_base::accept): Ditto. Add a `recoverable' out flag for error handling. * include/cygwin/cygserver_transport_sockets.h: Ditto. * include/cygwin/cygserver_transport_pipes.h: Ditto. (transport_layer_pipes): Change type of the `pipe_name' field. Remove the `inited' field, as unnecessary. Add new `is_accepted_endpoint' field. * include/cygwin/cygserver_transport.cc (transport_layer_base::impersonate_client): #ifdef as cygserver-only. (transport_layer_base::revert_to_self): Ditto. * include/cygwin/cygserver_transport_sockets.cc (transport_layer_sockets::listen): #ifdef as cygserver-only. (transport_layer_sockets::accept): #ifdef as cygserver-only. Analyse any errno from `accept ()' and set `recoverable' as appropriate. * cygserver_transport_pipes.cc: Add local #define of `FILE_FLAG_FIRST_PIPE_INSTANCE'. (pipe_instance_lock_once): New variable. (pipe_instance_lock): Ditto. (pipe_instance): Ditto. (initialise_pipe_instance_lock): New function. (transport_layer_pipes::transport_layer_pipes): Change initialization of `pipe_name'. Initialize `is_accepted_endpoint' as appropriate. Remove use of `inited'. (transport_layer_pipes::impersonate_client): #ifdef as cygserver-only. (transport_layer_pipes::revert_to_self): Ditto. (transport_layer_pipes::listen): Ditto. (transport_layer_pipes::accept): Ditto. Keep track of how often many named pipes have been created, in the `pipe_instance' variable, and pass the `FILE_FLAG_FIRST_PIPE_INSTANCE' flag on the open of the first instance. Analyse the error code from `CreateNamedPipe ()' and set the `recoverable' flag as appropriate. (transport_layer_pipes::close): Update the `pipe_instance' count. 2002-06-18 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h (cygserver_running): Add declaration. (api_fatal): Eliminate. * include/cygwin/cygserver.h (client_request_get_version::check_version): Change return type to bool. (check_cygserver_available): New function. (cygserver_init): Add check_version_too argument. * cygserver_client.cc (allow_daemon): Make a bool. (client_request_get_version::make_request): See errno on error. Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now handled in cygserver_init(). (client_request_get_version::check_version): Use syscall_printf() instead of api_fatal(). Return true if cygserver version is compatible. (check_cygserver_available): New function; code moved here from cygserver_init(). (cygserver_init): Move some code into check_cygserver_available(). * cygserver.cc (__set_errno): Copy from debug.cc so that set_errno() can be used when __OUTSIDE_CYGWIN__. (main): Call cygserver_init() to set up cygserver_running and add checks against this to (try and) prevent multiple copies of cygserver running simultaneously. Remember to delete all transport connections so that (one day) the transport classes can tidy up on cygserver shutdown. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (main): Adjust tracing output for a cleaner display when compiled without --enable-debugging. * threaded_queue.cc (threaded_queue::cleanup): Ditto. (queue_process_param::stop): Ditto. * include/cygwin/cygserver.h (client_request::make_request): Make non-virtual. (client_request::send): Make virtual and protected, not private. (client_request_attach_tty::send): New virtual method. * cygserver_client.cc: Use the `msglen()' accessor rather than `_header.msglen' throughout. (client_request_attach_tty::send): New method. (client_request::make_request): Remove the explicit close of `transport' as it is closed on deletion. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h: Change the client_request classes to give greater encapsulation and to allow variable length requests and replies. (enum cygserver_request_code): Now client_request::request_code_t. (class request_header): Now client_request::header_t. Make a union of the request_code and the error_code. The `cb' field, which was the buffer length, is now the `size_t msglen' field. (struct request_get_version): Now client_request_get_version::request_get_version. (struct request_shutdown): Remove unused type. (struct request_attach_tty): Now client_request_attach_tty::request_attach_tty. (client_request::_buf): Make field const. (client_request::_buflen): New const private field. (client_request::request_code): New accessor. (client_request::error_code): Ditto. (client_request::msglen): Ditto. (client_request::handle_request): New static method. (client_request::make_request): New virtual method. (client_request::handle): New method. (client_request::send): Make private. (client_request_get_version::check_version): New method. (client_request_get_version::serve): Make private. (client_request_get_version::version): Ditto. (client_request_shutdown::serve): Ditto. (client_request_attach_tty::req): Ditto. (client_request_attach_tty::serve): Ditto. (client_request_attach_tty::from_master): Make method const. (client_request_attach_tty::from_master): Ditto. * cygserver_client.cc (client_request_get_version::client_request_get_version): Track changes to the client_request classes. (client_request_attach_tty::client_request_attach_tty): Ditto. (client_request_get_version::check_version): New method to encapsulate code from cygserver_init(). (client_request_shutdown::client_request_shutdown): Move into "cygserver.cc". (client_request::send): Track changes to the client_request classes. Add more error checking. (client_request::handle_request): New static method containing the first half of the old server_request::process() code. (client_request::make_request): New method to replace the old cygserver_request() function. (client_request::handle): New method containing the second half of the old server_request::process() code. (cygserver_init): Track changes to the client_request classes. In particular, some code moved into the client_request_get_version::check_version() method. * cygserver.cc (client_request_attach_tty::serve): Track changes to the client_request classes. In particular, only return a reply body if some handles are successfully duplicated for the client. And remove goto's. (client_request_get_version::serve): Track changes to the client_request classes. (client_request_shutdown::serve): Ditto. (class client_request_invalid): Dead, and so young too. (server_request::request_buffer): Remove unnecessary field. (client_request_shutdown::client_request_shutdown): Moved here from "cygserver_client.cc". (server_request::process): Implementation moved into the new client_request::handle_request() and client_request::handle() methods. * cygserver_shm.h (class client_request_shm): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. (client_request_shm::serve): Make private. * cygserver_shm.cc (client_request_shm::client_request_shm): Track changes to the client_request classes. (client_request_shm::serve): Ditto * shm.cc (client_request_shm::client_request_shm): Ditto. Use alloc_sd() rather than set_security_attribute() to get access to the SECURITY_DESCRIPTOR length, so that we can use it to set the request body length. (shmat): Track changes to the client_request classes. In particular, allocate client_request objects on the stack rather than on the heap, and use the client_request::make_request() method rather than the old cygserver_request() function. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. * fhandler_tty.cc (fhandler_tty_slave::cygserver_attach_tty): Ditto. 2002-06-17 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (cygserver_transport::read): Change buffer type to void *. (cygserver_transport::write): Ditto. * include/cygwin/cygserver_transport_sockets.h (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * include/cygwin/cygserver_transport_pipes.h (cygserver_transport_pipes::read): Ditto. (cygserver_transport_pipes::write): Ditto. * cygserver_transport_sockets.cc (cygserver_transport_sockets::read): Ditto. (cygserver_transport_sockets::write): Ditto. * cygserver_transport_pipes.cc (cygserver_transport_pipes::read): Ditto. Set errno on error, to match behaviour of cygserver_transport_sockets class. (cygserver_transport_pipes::write): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (version): New static variable. (server_request_queue::add_connection): Remove my gratuitous use of studly caps. (setup_privileges): Declare static. (handle_signal): Ditto. (longopts): Make a local variable of main(). (opts): Ditto. (print_usage): New function. (print_version): Ditto (tip of the hat to Joshua Daniel Franklin for inspiration here). (main): More argument checking. Add --help and --version options. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::serve): Make pure virtual. * cygserver.cc (client_request::serve): Remove definition of pure virtual method. (class client_request_invalid): New class. (server_request::process): Use new client_request_invalid class. And remove goto's. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (class server_request): Add virtual destructor. (server_request_queue::addConnection): New method to replace bad virtual add() method. (request_loop): Replace call to queue->add() with call to queue->addConnection(). (server_request::server_request): Use field initialization. (server_request::~server_request): New virtual destructor. (server_request::process): Remove close and delete of transport_layer_base object. It is deleted by the server_request's own destructor and closed by its own destructor. * include/cygwin/cygserver.h (client_request::operator request_header): Remove unused method. * cygserver_client.cc: Ditto. * include/cygwin/cygserver_process.h (class cleanup_routine): Add virtual destructor. (cleanup_routine::cleanup): Make pure virtual. (class process_cache): Make destructor non-virtual. (process_cache::add): Ditto. * cygserver_process.cc (cleanup_routine::~cleanup_routine): New virtual destructor. * include/cygwin/cygserver_transport.h (class transport_layer_base): Add virtual destructor. * cygserver_transport.cc (transport_layer_base::~transport_layer_base): New virtual destructor. * include/cygwin/cygserver_transport_pipes.h (class transport_layer_pipes): Add virtual destructor. * cygserver_transport_pipes.cc (transport_layer_pipes::~transport_layer_pipes): New virtual destructor. (transport_layer_pipes::close): Null out handle after closing. * include/cygwin/cygserver_transport_sockets.h (class transport_layer_sockets): Add virtual destructor. * cygserver_transport_sockets.cc (transport_layer_sockets::~transport_layer_sockets): New virtual destructor. (transport_layer_sockets::close): Null out fd after closing. * threaded_queue.h (class queue_request): Add virtual destructor. (queue_request::process): Make pure virtual. * threaded_queue.cc (~queue_request): New virtual destructor. (queue_request::process): Remove definition of pure virtual method. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver.h (client_request::send): Make non-virtual. (class client_request_attach_tty): Put client- and server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards. * cygserver_client.cc: Ditto. (cygserver_init): Fix error handling. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc: Throughout the code, check and correct level of the XXX_printf() functions used. Comment out several of the debug_printf() calls with "// verbose:". Reformat and correct typos of some of the XXX_printf() formats. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * shm.cc (hi_ulong): New function to allow printing of a 64-bit key with current small_printf implementation. (lo_ulong): Ditto. (client_request_shm::client_request_shm): Use hi_ulong() and lo_ulong() in call to debug_printf(). 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver_shm.cc: Remove #define __INSIDE_CYGWIN__ from around <sys/shm.h> as it no longer contains any internal code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/sys/ipc.h (IPC_PRIVATE): Add cast to key_t. (IPC_INFO): New flag for ipcs(8). (IPC_RMID IPC_SET IPC_STAT): Renumber. * include/sys/shm.h (SHM_RDONLY SHM_RND): Renumber with distinct values [sic]. (class _shmattach): Internal type moved to "cygserver_shm.h". (class shmnode): Ditto. (class shmid_ds): Ditto. (struct shmid_ds): Add spare fields. (struct shminfo): New type for IPC_INFO interface. * cygserver_shm.h: Remove obsolete #if 0 ... #endif block. (class shm_cleanup): Remove unused class. (struct _shmattach): Internal type moved from <sys/shm.h>. (struct shmnode): Ditto. (struct int_shmid_ds): Ditto. Renamed to avoid name clash with public interface struct shmid_ds. Use the shmid_bs structure as a field. * cygserver_shm.cc: Remove obsolete #if 0 ... #endif block. (client_request_shm::serve): Update for redefinition of int_shmid_ds structure. * shm.cc (build_inprocess_shmds): Ditto. (fixup_shms_after_fork): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove obsolete #if 0 ... #endif code. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * include/cygwin/cygserver_transport.h (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Make a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. * cygserver_transport.cc (transport_layer_base::transport_layer_base): Remove since it is now redundant. (transport_layer_base::listen): Remove since it is now a pure virtual method. (transport_layer_base::accept): Ditto. (transport_layer_base::close): Ditto. (transport_layer_base::read): Ditto. (transport_layer_base::write): Ditto. (transport_layer_base::connect): Ditto. 2002-06-16 Conrad Scott <conrad.scott@dsl.pipex.com> * cygserver.cc (check_and_dup_handle): Only use security code if running on NT, i.e. if wincap.has_security(). (client_request_attach_tty::serve): Add check for has_security(). * cygserver_process.cc (process_cache::process): Use DWORD winpid throughout to avoid win32 vs. cygwin pid confusion. (process::process): Ditto. * cygserver_shm.cc (client_request_shm::serve): Only use security code if running on NT, i.e. if wincap.has_security(). * cygserver_shm.h (client_request_shm::parameters.in): Replace the ambiguous pid field with cygpid and winpid fields. (client_request_shm::client_request_shm): Reduce to only two client-side constructors: one for SHM_CREATE, another for all the other requests. * shm.cc (client_request_shm::client_request_shm): Ditto. Initialize cygpid and winpid fields here. On NT initialize sd_buf here using set_security_attribute() to make use of the euid and egid. (shmat): Use new client_request_shm constructor. (shmdt): Ditto. (shmctl): Ditto. (shmget): Ditto. Remove security code, now performed in the relevant client_request_shm constructor. * include/cygwin/cygserver_process.h: (class cleanup_routine): Change winpid type to DWORD. (class process): Ditto. 2002-06-15 Conrad Scott <conrad.scott@dsl.pipex.com> * woutsup.h: New file. * cygserver.cc: Use "woutsup.h" and new XXX_printf macros. (getfunc): New function, copied verbatim from "strace.cc". (__cygserver__printf): New function. * cygserver_client.cc: Use "woutsup.h" and new XXX_printf macros. * cygserver_process.cc: Ditto. * cygserver_shm.cc: Ditto. * cygserver_transport.cc: Ditto. * cygserver_transport_pipes.cc: Ditto. * cygserver_transport_sockets.cc: Ditto. * threaded_queue.cc: Ditto. * shm.cc: Remove trailing \n from XXX_printf format strings. * Makefile.in: Remove special __OUTSIDE_CYGWIN__ case for cygserver_shm.cc.
2002-09-22 14:04:15 +02:00
DACL_SECURITY_INFORMATION,
get_null_sd ()))
system_printf ("Can't set process security, %E");
}
2000-02-17 20:38:33 +01:00
/* Create synchronisation events */
* devices.cc: New file. * devices.gperf: New file. * devices.shilka: New file. * cygwin-gperf: New file. * cygwin-shilka: New file. * fhandler_fifo.cc: New file. * fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes fhandler.h throughout. Remove device argument and unit arguments from fhandler constructors throughout. Remove pc arguments to fhandler functions and use internal pc element instead, throughout. Use dev element in pc throughout. Use major/minor elements rather than units and device numbers previously in fhandler class. Use correct methods for fhandler file names rather than directly accessing file name variables, throughout. * Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o * dcrt0.cc (dll_crt0_1): Call device::init. * devices.h: Renumber devices based on more Linux-like major/minor numbers. Add more devices. Declare standard device storage. (device): Declare struct. * dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type. * dtable.cc (dtable::get_debugger_info): Ditto. (cygwin_attach_handle_to_fd): Ditto. (dtable::release): Remove special FH_SOCKET case in favor of generic "need_fixup_before" test. (dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name to build standard fhandler. (dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move out of dtable class. Don't accept a path_conv argument. Just build it here and pass it to: (build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class. Use intrinsic device type in path_conv to create new fhandler. (build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class. Simplify arguments to just take new 'device' type and a name. Just return pointer to fhandler rather than trying to insert into dtable. (dtable::dup_worker): Accommodate above build_fh name changes. (dtable::find_fifo): New (currently broken) function. (handle_to_fn): Use strechr for efficiency. * dtable.h: Reflect above build_fh name changes and argument differences. (fhandler_base *&operator []): Return self rather than copy of self. * fhandler.cc (fhandler_base::operator =): Use pc element to set normalized path. (fhandler_base::set_name): Ditto. (fhandler_base::raw_read): Use method to access name. (fhandler_base::write): Correctly use get_output_handle rather than get_handle. (handler_base::device_access_denied): New function. (fhandler_base::open): Eliminate pc argument and use pc element of fhandler_base throughout. (fhandler_base::fstat): Detect if device is based in filesystem and use fstat_fs to calculate stat, if so. (fhandler_base::fhandler_base): Eliminate handling of file names and, instead, just free appropriate component from pc. (fhandler_base::opendir): Remove path_conv parameter. * fhandler.h: Remove all device flags. (fhandler_base::pc): New element. (fhandler_base::set_name): Change argument to path_conv. (fhandler_base::error): New function. (fhandler_base::exists): New function. (fhandler_base::pc_binmode): New function. (fhandler_base::dev): New function. (fhandler_base::open_fs): New function. (fhandler_base::fstat_fs): New function. (fhandler_base::fstat_by_name): New function. (fhandler_base::fstat_by_handle): New function. (fhandler_base::isfifo): New function. (fhandler_base::is_slow): New function. (fhandler_base::is_auto_device): New function. (fhandler_base::is_fs_special): New function. (fhandler_base::device_access_denied): New function. (fhandler_base::operator DWORD&): New operator. (fhandler_base::get_name): Return normalized path from pc. (fhandler_base::get_win32_name): Return windows path from pc. (fhandler_base::isdevice): Renamed from is_device. (fhandler_base::get_native_name): Return device format. (fhandler_fifo): New class. (fhandler_nodevice): New class. (select_stuff::device_specific): Remove array. (select_stuff::device_specific_pipe): New class element. (select_stuff::device_specific_socket): New class element. (select_stuff::device_specific_serial): New class element. (select_stuff::select_stuff): Initialize new elements. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class from fhandler_disk_file. (fhandler_base::fstat_by_name): Ditto. (fhandler_base::fstat_by_name): Ditto. (fhandler_disk_file::open): Move most functionality into fhandler_base::open_fs. (fhandler_base::open_fs): New function. (fhandler_disk_file::close): Move most functionality into fhandler_base::close_fs. (fhandler_base::close_fs): New function. * fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging output. * fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard urandom device into appropriate place. (fhandler_socket::accept): Reflect change in fdsock return value. * fhandler_tty.cc: See "throughouts" above. * net.cc: Accommodate fdsock change throughout. (fdsock): Return success or failure, accept fd argument and device argument. * path.cc (symlink_info::major): New element. (symlink_info::minor): New element. (symlink_info::parse_device): Declare new function. (fs_info::update): Accommodate changes in path_conv class. (path_conv::fillin): Ditto. (path_conv::return_and_clear_normalized_path): Eliminate. (path_conv::set_normalized_path): New function. (path_conv::path_conv): Set info in dev element. Use path_conv methods Check for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff. where appropriate rather than direct access. Use set_normalized_path to set normalized path. (windows_device_names): Eliminate. (get_dev): Ditto. (get_raw_device_number): Ditto. (get_device_number): Ditto. (win32_device_name): Call new device name parser to do most of the heavy lifting. (mount_info::conv_to_win32_path): Fill in dev field as appropriate. (symlink_worker): Handle new device files. (symlink_info::check): Ditto. (symlink_info::parse_device): Define new function. * path.h (executable_states): Move here from fhandler.h. (fs_info): Rename variables to *_storage and create methods for accessing same. (path_conv): Add dev element, remove devn and unit and adjust inline methods to accommodate. (set_normalized_path): Declare new function. * pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos. (_pinfo::commune_send): Ditto. * pipe.cc (fhandler_pipe::close): check for existence of handle before closing it. (handler_pipe::create): Rename from make_pipe. Change arguments to accept fhandler_pipe array. Accommodate fifos. (pipe): Rework to deal with fhandler_pipe::create changes. (_pipe): Ditto. * select.cc: Use individual device_specific types throughout rather than indexing with obsolete device number. (set_bits): Use is_socket call rather than checking device number. * shared_info.h (CURR_MOUNT_MAGIC): Update. (conv_to_win32_path): Reflect addition of device argument. * syscalls.cc (mknod_worker): New function. (open): Use build_fh_name to build fhandler. (chown_worker): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (chmod_device): New function. (chmod): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. Use chmod_device to set mode of in-filesystem devices. (stat_worker): Eliminate path_conv argument. Call build_fh_name to construct fhandler. Use fh->error() rather than pc->error to detect errors in fhandler construction. (access_worker): New function pulled from access. Accommodate in-filesystem devices. (access): Use access_worker. (fpathconf): Detect if this is an 'auto' device rather than an on-filesystem device and handle appropriately. (mknod_worker): New function. (mknod32): New function. (chroot): Free normalized path -- assuming it was actually cmalloced. * tty.cc (create_tty_master): Tweak for new device class. (tty::common_init): Ditto. * winsup.h (stat_worker): Remove. (symlink_worker): Declare. * exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't worry about pending_signals since sig_dispatch_pending should always do the right thing now. (sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3. * pinfo.h: Move __SIG enum to sigproc.h. (PICOM_FIFO): New enum element. (_pinfo): Remove 'thread2signal' stuff throughout class. (_pinfo::commune_send): Make varargs. (_pinfo::sigtodo): Eliminate. (_pinfo::thread2signal): Ditto. * signal.cc (kill_worker): Eliminate call to setthread2signal. * sigproc.cc (local_sigtodo): Eliminate. (getlocal_sigtodo): Ditto. (sigelem): New class. (pending_signals): New class. (sigqueue): New variable, start of sigqueue linked list. (sigcatch_nonmain): Eliminate. (sigcatch_main): Eliminate. (sigcatch_nosync): Eliminate. (sigcomplete_nonmain): Eliminate. (pending_signals): Eliminate. (sig_clear): Call signal thread to clear pending signals, unless already in signal thread. (sigpending): Call signal thread to get pending signals. (sig_dispatch_pending): Eliminate use of pending_signals and just check sigqueue. (sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close signal pipe handle. (sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send signals. (getevent): Eliminate. (pending_signals::add): New function. (pending_signals::del): New function. (pending_signals::next): New function. (wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to communicate and maintain a linked list of signals. * sigproc.h: Move __SIG defines here. Add __SIGPENDING. (sig_dispatch_pending): Remove "C" specifier. (sig_handle): Accept a mask argument. * thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
if (ptym->get_major () != DEV_TTYM_MAJOR)
2000-02-17 20:38:33 +01:00
{
ptym->output_done_event = ptym->ioctl_done_event =
ptym->ioctl_request_event = NULL;
}
else
{
if (!(ptym->output_done_event = get_event (OUTPUT_DONE_EVENT)))
2000-02-17 20:38:33 +01:00
return FALSE;
if (!(ptym->ioctl_done_event = get_event (IOCTL_DONE_EVENT)))
2000-02-17 20:38:33 +01:00
return FALSE;
if (!(ptym->ioctl_request_event = get_event (IOCTL_REQUEST_EVENT)))
2000-02-17 20:38:33 +01:00
return FALSE;
}
if (!(ptym->input_available_event = get_event (INPUT_AVAILABLE_EVENT, TRUE)))
return FALSE;
2000-02-17 20:38:33 +01:00
char buf[40];
__small_sprintf (buf, OUTPUT_MUTEX, ntty);
if (!(ptym->output_mutex = CreateMutex (&sec_all, FALSE, buf)))
{
termios_printf ("can't create %s", buf);
set_errno (ENOENT);
return FALSE;
}
__small_sprintf (buf, INPUT_MUTEX, ntty);
if (!(ptym->input_mutex = CreateMutex (&sec_all, FALSE, buf)))
{
termios_printf ("can't create %s", buf);
set_errno (ENOENT);
return FALSE;
}
* debug.h (handle_list): Move here from debug.cc. Add "inherit" flag functionality. * cygheap.cc (init_cheap): Move cygheap_max calculation to _csbrk. (_csbrk): Reorganize to not assume first allocation is <= 1 page. (cygheap_setup_for_child): Mark protected handle as inheritable. * cygheap.h (cygheap_debug): New struct. (init_cygheap): Add new structure when debugging. * dcrt0.cc (dll_crt0_1): Remove call to debug_init. Close ppid_handle here, if appropriate. Don't protect subproc_ready, since it is already protected in the parent. Call memory_init prior to ProtectHandle to ensure that cygheap is set up. Call debug_fixup_after_fork_exec when appropriate. (_dll_crt0): Don't close ppid_handle here. * debug.cc: Use cygheap debug structure rather than static elements throughout. (add_handle): Don't issue a warning if attempt to protect handle in exactly the same way from exactly the same place. Add pid info to warning output. Accept additional argument controlling whether handle is to be inherited. Add pid to stored information. (debug_fixup_after_fork_exec): Renamed from debug_fixup_after_fork. Reorganize to avoid erroneously skipping handles. (mark_closed): Add pid info to warning output. (setclexec): Rename from setclexec_pid. * fhandler.cc (fhandler_base::get_default_fmode): Minor reorg. (fhandler_base::fstat): Add debugging output. (fhandler_base::set_inheritance): Call setclexec rather than setclexec_pid. (fhandler_base::fork_fixup): Ditto. * fhandler_console.cc (get_tty_stuff): Mark protected handle as inheritable. * fhandler_tty.cc (fhandler_tty_slave::open): Ditto. * tty.cc (tty::make_pipes): Ditto. (tty::common_init): Ditto. * fork.cc (fork_parent): Ditto. (fork_child): Close protected handles with correct name. Remove debug_fixup_after_fork call. * fhandler_socket.cc (fhandler_socket::create_secret_event): Mark protected handle as inheritable/non-inheritable, as appropriate. * shared.cc (memory_init): Mark protected handle as inheritable. Call debug_init here. * sigproc.cc (wait_sig): Close protected handle with correct name. * spawn.cc (spawn_guts): Rename spr to subproc_ready and mark it as inheritable. * exceptions.cc (debugger_command): Try to run dumper.exe, if found. * syscalls.cc (fstat64): Don't follow symlinks for path_conv lookup since path is already resolved.
2002-07-13 22:00:27 +02:00
ProtectHandle1INH (ptym->output_mutex, output_mutex);
ProtectHandle1INH (ptym->input_mutex, input_mutex);
2000-02-17 20:38:33 +01:00
winsize.ws_col = 80;
winsize.ws_row = 25;
2001-03-18 22:11:25 +01:00
termios_printf ("tty%d opened", ntty);
2000-02-17 20:38:33 +01:00
return TRUE;
}