2000-02-17 20:38:33 +01:00
|
|
|
/* mmap.cc
|
|
|
|
|
2004-02-09 05:04:24 +01:00
|
|
|
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004 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. */
|
|
|
|
|
2000-08-02 18:28:18 +02:00
|
|
|
#include "winsup.h"
|
2001-01-15 20:42:33 +01:00
|
|
|
#include <unistd.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <sys/mman.h>
|
2001-07-26 21:22:24 +02:00
|
|
|
#include "security.h"
|
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"
|
2000-08-12 07:35:42 +02:00
|
|
|
#include "dtable.h"
|
2000-08-22 05:58:47 +02:00
|
|
|
#include "cygerrno.h"
|
2001-04-16 19:26:04 +02:00
|
|
|
#include "cygheap.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "pinfo.h"
|
2001-07-10 23:04:14 +02:00
|
|
|
#include "sys/cygwin.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-06-27 15:01:35 +02:00
|
|
|
#define PAGE_CNT(bytes) howmany((bytes),getpagesize())
|
2001-01-15 20:42:33 +01:00
|
|
|
|
2002-09-23 02:31:31 +02:00
|
|
|
#define PGBITS (sizeof (DWORD)*8)
|
|
|
|
#define MAPSIZE(pages) howmany ((pages), PGBITS)
|
2001-01-15 20:42:33 +01:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
#define MAP_SET(n) (page_map_[(n)/PGBITS] |= (1L << ((n) % PGBITS)))
|
|
|
|
#define MAP_CLR(n) (page_map_[(n)/PGBITS] &= ~(1L << ((n) % PGBITS)))
|
|
|
|
#define MAP_ISSET(n) (page_map_[(n)/PGBITS] & (1L << ((n) % PGBITS)))
|
2001-01-15 20:42:33 +01:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
/* Used for accessing the page file (anonymous mmaps). */
|
|
|
|
static fhandler_disk_file fh_paging_file;
|
|
|
|
|
|
|
|
/* Class structure used to keep a record of all current mmap areas
|
|
|
|
in a process. Needed for bookkeeping all mmaps in a process and
|
|
|
|
for duplicating all mmaps after fork() since mmaps are not propagated
|
|
|
|
to child processes by Windows. All information must be duplicated
|
|
|
|
by hand, see fixup_mmaps_after_fork().
|
2003-11-28 21:55:59 +01:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
The class structure:
|
2003-11-28 21:55:59 +01:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
One member of class map per process, global variable mmapped_areas.
|
|
|
|
Contains a dynamic class list array. Each list entry represents all
|
|
|
|
mapping to a file, keyed by file descriptor and file name hash.
|
|
|
|
Each list entry contains a dynamic class mmap_record array. Each
|
|
|
|
mmap_record represents exactly one mapping. For each mapping, there's
|
|
|
|
an additional so called `page_map'. It's an array of bits, one bit
|
|
|
|
per mapped memory page. The bit is set if the page is accessible,
|
|
|
|
unset otherwise. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
class mmap_record
|
|
|
|
{
|
|
|
|
private:
|
2001-01-11 13:33:12 +01:00
|
|
|
int fdesc_;
|
2000-02-17 20:38:33 +01:00
|
|
|
HANDLE mapping_handle_;
|
|
|
|
DWORD access_mode_;
|
2003-04-01 18:11:41 +02:00
|
|
|
_off64_t offset_;
|
2000-02-17 20:38:33 +01:00
|
|
|
DWORD size_to_map_;
|
2001-01-15 20:42:33 +01:00
|
|
|
caddr_t base_address_;
|
2003-09-04 12:27:51 +02:00
|
|
|
DWORD *page_map_;
|
* 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 dev;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
public:
|
2003-04-01 18:11:41 +02:00
|
|
|
mmap_record (int fd, HANDLE h, DWORD ac, _off64_t o, DWORD s, caddr_t b) :
|
2001-04-16 19:26:04 +02:00
|
|
|
fdesc_ (fd),
|
|
|
|
mapping_handle_ (h),
|
|
|
|
access_mode_ (ac),
|
|
|
|
offset_ (o),
|
|
|
|
size_to_map_ (s),
|
|
|
|
base_address_ (b),
|
2003-09-04 12:27:51 +02:00
|
|
|
page_map_ (NULL)
|
2001-04-16 19:26:04 +02:00
|
|
|
{
|
* 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
|
|
|
dev.devn = 0;
|
2001-09-03 04:13:05 +02:00
|
|
|
if (fd >= 0 && !cygheap->fdtab.not_open (fd))
|
* 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
|
|
|
dev = cygheap->fdtab[fd]->dev ();
|
2001-04-16 19:26:04 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-01-11 13:33:12 +01:00
|
|
|
int get_fd () const { return fdesc_; }
|
2000-02-17 20:38:33 +01:00
|
|
|
HANDLE get_handle () const { return mapping_handle_; }
|
* 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& get_device () { return dev; }
|
2000-02-17 20:38:33 +01:00
|
|
|
DWORD get_access () const { return access_mode_; }
|
|
|
|
DWORD get_offset () const { return offset_; }
|
|
|
|
DWORD get_size () const { return size_to_map_; }
|
2001-01-15 20:42:33 +01:00
|
|
|
caddr_t get_address () const { return base_address_; }
|
2003-09-04 12:27:51 +02:00
|
|
|
|
|
|
|
bool alloc_page_map (_off64_t off, DWORD len);
|
|
|
|
void free_page_map () { if (page_map_) cfree (page_map_); }
|
|
|
|
void fixup_page_map (void);
|
|
|
|
|
|
|
|
DWORD find_unused_pages (DWORD pages);
|
|
|
|
_off64_t map_pages (_off64_t off, DWORD len);
|
2003-12-07 23:37:12 +01:00
|
|
|
bool unmap_pages (caddr_t addr, DWORD len);
|
2003-01-14 21:40:09 +01:00
|
|
|
int access (caddr_t address);
|
2001-04-16 19:26:04 +02:00
|
|
|
|
|
|
|
fhandler_base *alloc_fh ();
|
|
|
|
void free_fh (fhandler_base *fh);
|
2000-02-17 20:38:33 +01:00
|
|
|
};
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
class list
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
mmap_record *recs;
|
|
|
|
int nrecs, maxrecs;
|
|
|
|
int fd;
|
|
|
|
DWORD hash;
|
|
|
|
|
|
|
|
public:
|
|
|
|
int get_fd () const { return fd; }
|
|
|
|
DWORD get_hash () const { return hash; }
|
|
|
|
mmap_record *get_record (int i) { return i >= nrecs ? NULL : recs + i; }
|
|
|
|
|
|
|
|
void set (int nfd);
|
|
|
|
mmap_record *add_record (mmap_record r, _off64_t off, DWORD len);
|
|
|
|
bool del_record (int i);
|
|
|
|
void free_recs () { if (recs) cfree (recs); }
|
|
|
|
mmap_record *search_record (_off64_t off, DWORD len);
|
|
|
|
long search_record (caddr_t addr, DWORD len, caddr_t &m_addr, DWORD &m_len,
|
|
|
|
long start);
|
|
|
|
};
|
|
|
|
|
|
|
|
class map
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
list *lists;
|
|
|
|
int nlists, maxlists;
|
|
|
|
|
|
|
|
public:
|
|
|
|
list *get_list (int i) { return i >= nlists ? NULL : lists + i; }
|
|
|
|
list *get_list_by_fd (int fd);
|
|
|
|
list *add_list (int fd);
|
|
|
|
void del_list (int i);
|
|
|
|
};
|
|
|
|
|
|
|
|
/* This is the global map structure pointer. It's allocated once on the
|
|
|
|
first call to mmap64(). */
|
|
|
|
static map *mmapped_areas;
|
|
|
|
|
2001-01-15 20:42:33 +01:00
|
|
|
DWORD
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record::find_unused_pages (DWORD pages)
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
|
|
|
DWORD mapped_pages = PAGE_CNT (size_to_map_);
|
|
|
|
DWORD start;
|
|
|
|
|
2001-11-05 21:58:22 +01:00
|
|
|
if (pages > mapped_pages)
|
|
|
|
return (DWORD)-1;
|
2001-01-29 10:25:10 +01:00
|
|
|
for (start = 0; start <= mapped_pages - pages; ++start)
|
2001-01-15 20:42:33 +01:00
|
|
|
if (!MAP_ISSET (start))
|
|
|
|
{
|
2001-09-03 04:13:05 +02:00
|
|
|
DWORD cnt;
|
|
|
|
for (cnt = 0; cnt < pages; ++cnt)
|
2001-01-15 20:42:33 +01:00
|
|
|
if (MAP_ISSET (start + cnt))
|
|
|
|
break;
|
2001-09-03 04:13:05 +02:00
|
|
|
if (cnt >= pages)
|
2001-01-15 20:42:33 +01:00
|
|
|
return start;
|
|
|
|
}
|
|
|
|
return (DWORD)-1;
|
|
|
|
}
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
bool
|
|
|
|
mmap_record::alloc_page_map (_off64_t off, DWORD len)
|
2003-02-07 21:57:30 +01:00
|
|
|
{
|
|
|
|
/* Allocate one bit per page */
|
2003-09-04 12:27:51 +02:00
|
|
|
if (!(page_map_ = (DWORD *) ccalloc (HEAP_MMAP,
|
|
|
|
MAPSIZE (PAGE_CNT (size_to_map_)),
|
|
|
|
sizeof (DWORD))))
|
|
|
|
return false;
|
|
|
|
|
2003-02-07 21:57:30 +01:00
|
|
|
if (wincap.virtual_protect_works_on_shared_pages ())
|
|
|
|
{
|
|
|
|
DWORD old_prot;
|
|
|
|
|
|
|
|
off -= offset_;
|
|
|
|
len = PAGE_CNT (len) * getpagesize ();
|
|
|
|
if (off > 0 &&
|
2003-03-09 21:31:07 +01:00
|
|
|
!VirtualProtect (base_address_, off, PAGE_NOACCESS, &old_prot))
|
2003-07-21 15:06:49 +02:00
|
|
|
syscall_printf ("VirtualProtect(%x,%D) failed: %E", base_address_, off);
|
2003-02-07 21:57:30 +01:00
|
|
|
if (off + len < size_to_map_
|
|
|
|
&& !VirtualProtect (base_address_ + off + len,
|
|
|
|
size_to_map_ - len - off,
|
|
|
|
PAGE_NOACCESS, &old_prot))
|
2003-07-21 15:06:49 +02:00
|
|
|
syscall_printf ("VirtualProtect(%x,%D) failed: %E",
|
2003-02-07 21:57:30 +01:00
|
|
|
base_address_ + off + len, size_to_map_ - len - off);
|
|
|
|
off /= getpagesize ();
|
|
|
|
len /= getpagesize ();
|
|
|
|
while (len-- > 0)
|
|
|
|
MAP_SET (off + len);
|
|
|
|
}
|
2003-09-04 12:27:51 +02:00
|
|
|
return true;
|
2003-02-07 21:57:30 +01:00
|
|
|
}
|
|
|
|
|
2003-04-01 18:11:41 +02:00
|
|
|
_off64_t
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record::map_pages (_off64_t off, DWORD len)
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
2003-02-07 21:57:30 +01:00
|
|
|
/* Used ONLY if this mapping matches into the chunk of another already
|
|
|
|
performed mapping in a special case of MAP_ANON|MAP_PRIVATE.
|
2003-03-09 21:31:07 +01:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
Otherwise it's job is now done by alloc_page_map(). */
|
2001-01-15 20:42:33 +01:00
|
|
|
DWORD prot, old_prot;
|
|
|
|
switch (access_mode_)
|
|
|
|
{
|
|
|
|
case FILE_MAP_WRITE:
|
|
|
|
prot = PAGE_READWRITE;
|
|
|
|
break;
|
|
|
|
case FILE_MAP_READ:
|
|
|
|
prot = PAGE_READONLY;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
prot = PAGE_WRITECOPY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
debug_printf ("map_pages (fd=%d, off=%D, len=%u)", fdesc_, off, len);
|
2001-01-15 20:42:33 +01:00
|
|
|
len = PAGE_CNT (len);
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
if ((off = find_unused_pages (len)) == (DWORD)-1)
|
2003-02-07 21:57:30 +01:00
|
|
|
return 0L;
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (wincap.virtual_protect_works_on_shared_pages ()
|
2003-02-07 21:57:30 +01:00
|
|
|
&& !VirtualProtect (base_address_ + off * getpagesize (),
|
2001-09-03 04:13:05 +02:00
|
|
|
len * getpagesize (), prot, &old_prot))
|
2002-03-13 21:54:57 +01:00
|
|
|
{
|
2002-09-24 16:17:50 +02:00
|
|
|
__seterrno ();
|
2003-04-01 18:11:41 +02:00
|
|
|
return (_off64_t)-1;
|
2002-03-13 21:54:57 +01:00
|
|
|
}
|
2001-01-15 20:42:33 +01:00
|
|
|
|
2003-02-07 21:57:30 +01:00
|
|
|
while (len-- > 0)
|
|
|
|
MAP_SET (off + len);
|
|
|
|
return off * getpagesize ();
|
2001-01-15 20:42:33 +01:00
|
|
|
}
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
bool
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record::unmap_pages (caddr_t addr, DWORD len)
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
|
|
|
DWORD old_prot;
|
|
|
|
DWORD off = addr - base_address_;
|
|
|
|
off /= getpagesize ();
|
|
|
|
len = PAGE_CNT (len);
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (wincap.virtual_protect_works_on_shared_pages ()
|
2001-01-15 20:42:33 +01:00
|
|
|
&& !VirtualProtect (base_address_ + off * getpagesize (),
|
2001-09-03 04:13:05 +02:00
|
|
|
len * getpagesize (), PAGE_NOACCESS, &old_prot))
|
2003-09-04 12:27:51 +02:00
|
|
|
syscall_printf ("-1 = unmap_pages (): %E");
|
2001-01-15 20:42:33 +01:00
|
|
|
|
|
|
|
for (; len-- > 0; ++off)
|
|
|
|
MAP_CLR (off);
|
|
|
|
/* Return TRUE if all pages are free'd which may result in unmapping
|
|
|
|
the whole chunk. */
|
2002-09-23 02:31:31 +02:00
|
|
|
for (len = MAPSIZE (PAGE_CNT (size_to_map_)); len > 0; )
|
2003-09-04 12:27:51 +02:00
|
|
|
if (page_map_[--len])
|
2003-12-07 23:37:12 +01:00
|
|
|
return false;
|
|
|
|
return true;
|
2001-01-15 20:42:33 +01:00
|
|
|
}
|
|
|
|
|
2001-02-05 13:36:41 +01:00
|
|
|
void
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record::fixup_page_map ()
|
2001-02-05 13:36:41 +01:00
|
|
|
{
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (!wincap.virtual_protect_works_on_shared_pages ())
|
2001-02-05 13:36:41 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
DWORD prot, old_prot;
|
|
|
|
switch (access_mode_)
|
|
|
|
{
|
|
|
|
case FILE_MAP_WRITE:
|
|
|
|
prot = PAGE_READWRITE;
|
|
|
|
break;
|
|
|
|
case FILE_MAP_READ:
|
|
|
|
prot = PAGE_READONLY;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
prot = PAGE_WRITECOPY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (DWORD off = PAGE_CNT (size_to_map_); off > 0; --off)
|
2003-02-07 21:57:30 +01:00
|
|
|
VirtualProtect (base_address_ + off * getpagesize (), getpagesize (),
|
|
|
|
MAP_ISSET (off - 1) ? prot : PAGE_NOACCESS, &old_prot);
|
2001-02-05 13:36:41 +01:00
|
|
|
}
|
|
|
|
|
2002-03-11 18:57:22 +01:00
|
|
|
int
|
2003-01-14 21:40:09 +01:00
|
|
|
mmap_record::access (caddr_t address)
|
2002-03-11 18:57:22 +01:00
|
|
|
{
|
|
|
|
if (address < base_address_ || address >= base_address_ + size_to_map_)
|
|
|
|
return 0;
|
|
|
|
DWORD off = (address - base_address_) / getpagesize ();
|
|
|
|
return MAP_ISSET (off);
|
|
|
|
}
|
|
|
|
|
2001-04-16 19:26:04 +02:00
|
|
|
fhandler_base *
|
|
|
|
mmap_record::alloc_fh ()
|
|
|
|
{
|
|
|
|
if (get_fd () == -1)
|
|
|
|
{
|
|
|
|
fh_paging_file.set_io_handle (INVALID_HANDLE_VALUE);
|
|
|
|
return &fh_paging_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The file descriptor could have been closed or, even
|
|
|
|
worse, could have been reused for another file before
|
|
|
|
the call to fork(). This requires creating a fhandler
|
|
|
|
of the correct type to be sure to call the method of the
|
|
|
|
correct class. */
|
* 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
|
|
|
return build_fh_dev (get_device ());
|
2001-04-16 19:26:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
mmap_record::free_fh (fhandler_base *fh)
|
|
|
|
{
|
|
|
|
if (get_fd () != -1)
|
|
|
|
cfree (fh);
|
|
|
|
}
|
|
|
|
|
2001-01-15 20:42:33 +01:00
|
|
|
mmap_record *
|
2003-04-01 18:11:41 +02:00
|
|
|
list::add_record (mmap_record r, _off64_t off, DWORD len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
if (nrecs == maxrecs)
|
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record *new_recs;
|
|
|
|
if (maxrecs == 0)
|
2003-11-28 21:55:59 +01:00
|
|
|
new_recs = (mmap_record *)
|
2003-09-04 12:27:51 +02:00
|
|
|
cmalloc (HEAP_MMAP, 5 * sizeof (mmap_record));
|
|
|
|
else
|
|
|
|
new_recs = (mmap_record *)
|
|
|
|
crealloc (recs, (maxrecs + 5) * sizeof (mmap_record));
|
|
|
|
if (!new_recs)
|
2003-11-28 21:55:59 +01:00
|
|
|
return NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
maxrecs += 5;
|
2003-09-04 12:27:51 +02:00
|
|
|
recs = new_recs;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-01-15 20:42:33 +01:00
|
|
|
recs[nrecs] = r;
|
2003-09-04 12:27:51 +02:00
|
|
|
if (!recs[nrecs].alloc_page_map (off, len))
|
|
|
|
return NULL;
|
2001-01-15 20:42:33 +01:00
|
|
|
return recs + nrecs++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Used in mmap() */
|
|
|
|
mmap_record *
|
2003-09-04 12:27:51 +02:00
|
|
|
list::search_record (_off64_t off, DWORD len)
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
|
|
|
if (fd == -1 && !off)
|
|
|
|
{
|
|
|
|
len = PAGE_CNT (len);
|
|
|
|
for (int i = 0; i < nrecs; ++i)
|
2003-09-04 12:27:51 +02:00
|
|
|
if (recs[i].find_unused_pages (len) != (DWORD)-1)
|
2001-01-15 20:42:33 +01:00
|
|
|
return recs + i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (int i = 0; i < nrecs; ++i)
|
|
|
|
if (off >= recs[i].get_offset ()
|
2002-06-27 15:01:35 +02:00
|
|
|
&& off + len <= recs[i].get_offset ()
|
|
|
|
+ (PAGE_CNT (recs[i].get_size ()) * getpagesize ()))
|
2001-01-15 20:42:33 +01:00
|
|
|
return recs + i;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Used in munmap() */
|
2002-02-25 18:47:51 +01:00
|
|
|
long
|
2003-09-04 12:27:51 +02:00
|
|
|
list::search_record (caddr_t addr, DWORD len, caddr_t &m_addr, DWORD &m_len,
|
2003-07-05 20:59:35 +02:00
|
|
|
_off_t start)
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
2003-07-05 20:59:35 +02:00
|
|
|
caddr_t low, high;
|
|
|
|
|
2001-01-15 20:42:33 +01:00
|
|
|
for (int i = start + 1; i < nrecs; ++i)
|
2003-07-05 20:59:35 +02:00
|
|
|
{
|
|
|
|
low = (addr >= recs[i].get_address ()) ? addr : recs[i].get_address ();
|
2003-07-26 06:53:59 +02:00
|
|
|
high = recs[i].get_address ()
|
2003-07-05 20:59:35 +02:00
|
|
|
+ (PAGE_CNT (recs[i].get_size ()) * getpagesize ());
|
|
|
|
high = (addr + len < high) ? addr + len : high;
|
|
|
|
if (low < high)
|
|
|
|
{
|
|
|
|
m_addr = low;
|
|
|
|
m_len = high - low;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
2002-02-25 18:47:51 +01:00
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-09-04 12:27:51 +02:00
|
|
|
list::set (int nfd)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
if ((fd = nfd) != -1)
|
|
|
|
hash = cygheap->fdtab[fd]->get_namehash ();
|
|
|
|
nrecs = maxrecs = 0;
|
|
|
|
recs = NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
bool
|
|
|
|
list::del_record (int i)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
if (i < nrecs)
|
|
|
|
{
|
|
|
|
recs[i].free_page_map ();
|
|
|
|
for (; i < nrecs - 1; i++)
|
|
|
|
recs[i] = recs[i + 1];
|
|
|
|
nrecs--;
|
|
|
|
}
|
|
|
|
/* Return true if the list is empty which allows the caller to remove
|
|
|
|
this list from the list array. */
|
|
|
|
return !nrecs;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
list *
|
|
|
|
map::get_list_by_fd (int fd)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i=0; i<nlists; i++)
|
2003-09-04 12:27:51 +02:00
|
|
|
/* The fd isn't sufficient since it could already be the fd of another
|
|
|
|
file. So we use the name hash value to identify the file unless
|
|
|
|
it's an anonymous mapping in which case the fd (-1) is sufficient. */
|
|
|
|
if ((fd == -1 && lists[i].get_fd () == -1)
|
|
|
|
|| (fd != -1
|
|
|
|
&& lists[i].get_hash () == cygheap->fdtab[fd]->get_namehash ()))
|
|
|
|
return lists + i;
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
list *
|
2003-09-04 12:27:51 +02:00
|
|
|
map::add_list (int fd)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
if (nlists == maxlists)
|
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
list *new_lists;
|
|
|
|
if (maxlists == 0)
|
2003-11-28 21:55:59 +01:00
|
|
|
new_lists = (list *) cmalloc (HEAP_MMAP, 5 * sizeof (list));
|
2003-09-04 12:27:51 +02:00
|
|
|
else
|
|
|
|
new_lists = (list *) crealloc (lists, (maxlists + 5) * sizeof (list));
|
|
|
|
if (!new_lists)
|
2003-11-28 21:55:59 +01:00
|
|
|
return NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
maxlists += 5;
|
2003-09-04 12:27:51 +02:00
|
|
|
lists = new_lists;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2003-09-04 12:27:51 +02:00
|
|
|
lists[nlists].set (fd);
|
|
|
|
return lists + nlists++;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-09-04 12:27:51 +02:00
|
|
|
map::del_list (int i)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
if (i < nlists)
|
|
|
|
{
|
|
|
|
lists[i].free_recs ();
|
|
|
|
for (; i < nlists - 1; i++)
|
2003-11-28 21:55:59 +01:00
|
|
|
lists[i] = lists[i + 1];
|
2003-09-04 12:27:51 +02:00
|
|
|
nlists--;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-09-09 11:41:18 +02:00
|
|
|
extern "C" void *
|
|
|
|
mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-07-21 15:06:49 +02:00
|
|
|
syscall_printf ("addr %x, len %u, prot %x, flags %x, fd %d, off %D",
|
2000-02-17 20:38:33 +01:00
|
|
|
addr, len, prot, flags, fd, off);
|
|
|
|
|
2003-11-06 15:33:16 +01:00
|
|
|
static DWORD granularity = getshmlba ();
|
2001-01-15 20:42:33 +01:00
|
|
|
|
|
|
|
/* Error conditions according to SUSv2 */
|
|
|
|
if (off % getpagesize ()
|
2001-01-15 23:18:14 +01:00
|
|
|
|| (!(flags & MAP_SHARED) && !(flags & MAP_PRIVATE))
|
|
|
|
|| ((flags & MAP_SHARED) && (flags & MAP_PRIVATE))
|
2003-07-03 22:53:26 +02:00
|
|
|
|| ((flags & MAP_FIXED) && ((DWORD)addr % getpagesize ()))
|
2001-01-15 20:42:33 +01:00
|
|
|
|| !len)
|
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
2001-01-15 23:18:14 +01:00
|
|
|
syscall_printf ("-1 = mmap(): EINVAL");
|
2001-01-15 20:42:33 +01:00
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
SetResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-11-15 07:27:48 +01:00
|
|
|
if (mmapped_areas == NULL)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* First mmap call, create STL map */
|
2003-09-04 12:27:51 +02:00
|
|
|
mmapped_areas = (map *) ccalloc (HEAP_MMAP, 1, sizeof (map));
|
2000-11-15 07:27:48 +01:00
|
|
|
if (mmapped_areas == NULL)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_errno (ENOMEM);
|
|
|
|
syscall_printf ("-1 = mmap(): ENOMEM");
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2001-01-15 20:42:33 +01:00
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & MAP_ANONYMOUS)
|
|
|
|
fd = -1;
|
|
|
|
|
|
|
|
/* Map always in multipliers of `granularity'-sized chunks. */
|
2003-04-01 18:11:41 +02:00
|
|
|
_off64_t gran_off = off & ~(granularity - 1);
|
2002-09-24 15:48:07 +02:00
|
|
|
DWORD gran_len = howmany (off + len, granularity) * granularity - gran_off;
|
2001-01-15 20:42:33 +01:00
|
|
|
|
2001-10-16 16:04:26 +02:00
|
|
|
fhandler_base *fh;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-01-15 23:18:14 +01:00
|
|
|
if (fd != -1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* Ensure that fd is open */
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("-1 = mmap(): EBADF");
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2001-01-15 20:42:33 +01:00
|
|
|
return MAP_FAILED;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-10-16 16:04:26 +02:00
|
|
|
fh = cfd;
|
* 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 (fh->get_device () == FH_FS)
|
2001-09-03 04:13:05 +02:00
|
|
|
{
|
2002-02-25 18:47:51 +01:00
|
|
|
DWORD high;
|
|
|
|
DWORD low = GetFileSize (fh->get_handle (), &high);
|
2003-04-01 18:11:41 +02:00
|
|
|
_off64_t fsiz = ((_off64_t)high << 32) + low;
|
2003-07-05 20:59:35 +02:00
|
|
|
/* Don't allow mappings beginning beyond EOF since Windows can't
|
|
|
|
handle that POSIX like. FIXME: Still looking for a good idea
|
|
|
|
to allow that nevertheless. */
|
|
|
|
if (gran_off >= fsiz)
|
|
|
|
{
|
|
|
|
set_errno (ENXIO);
|
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK,
|
|
|
|
"mmap");
|
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
2001-01-15 20:42:33 +01:00
|
|
|
fsiz -= gran_off;
|
|
|
|
if (gran_len > fsiz)
|
|
|
|
gran_len = fsiz;
|
|
|
|
}
|
2001-10-16 16:04:26 +02:00
|
|
|
else if (fh->get_device () == FH_ZERO)
|
2001-01-29 14:39:17 +01:00
|
|
|
/* mmap /dev/zero is like MAP_ANONYMOUS. */
|
2001-09-03 04:13:05 +02:00
|
|
|
fd = -1;
|
2001-01-15 23:18:14 +01:00
|
|
|
}
|
|
|
|
if (fd == -1)
|
|
|
|
{
|
|
|
|
fh_paging_file.set_io_handle (INVALID_HANDLE_VALUE);
|
|
|
|
fh = &fh_paging_file;
|
|
|
|
}
|
|
|
|
|
2003-02-07 21:57:30 +01:00
|
|
|
list *map_list = mmapped_areas->get_list_by_fd (fd);
|
2001-02-08 22:02:36 +01:00
|
|
|
|
|
|
|
/* First check if this mapping matches into the chunk of another
|
2001-04-19 09:44:34 +02:00
|
|
|
already performed mapping. Only valid for MAP_ANON in a special
|
|
|
|
case of MAP_PRIVATE. */
|
2003-02-07 21:57:30 +01:00
|
|
|
if (map_list && fd == -1 && off == 0 && !(flags & MAP_FIXED))
|
2001-01-15 23:18:14 +01:00
|
|
|
{
|
|
|
|
mmap_record *rec;
|
2003-09-04 12:27:51 +02:00
|
|
|
if ((rec = map_list->search_record (off, len)) != NULL)
|
2001-02-08 22:02:36 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
if ((off = rec->map_pages (off, len)) == (_off64_t)-1)
|
2002-03-13 21:54:57 +01:00
|
|
|
{
|
2002-09-24 16:17:50 +02:00
|
|
|
syscall_printf ("-1 = mmap()");
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK|WRITE_LOCK, "mmap");
|
2002-03-13 21:54:57 +01:00
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
2001-01-15 23:18:14 +01:00
|
|
|
caddr_t ret = rec->get_address () + off;
|
|
|
|
syscall_printf ("%x = mmap() succeeded", ret);
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2001-01-15 23:18:14 +01:00
|
|
|
return ret;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-09-28 00:39:50 +02:00
|
|
|
DWORD access = (prot & PROT_WRITE) ? FILE_MAP_WRITE : FILE_MAP_READ;
|
|
|
|
/* copy-on-write doesn't work at all on 9x using anonymous maps.
|
|
|
|
Workaround: Anonymous mappings always use normal READ or WRITE
|
|
|
|
access and don't use named file mapping.
|
|
|
|
copy-on-write doesn't also work properly on 9x with real files.
|
|
|
|
While the changes are not propagated to the file, they are
|
|
|
|
visible to other processes sharing the same file mapping object.
|
|
|
|
Workaround: Don't use named file mapping. That should work since
|
2001-11-05 07:09:15 +01:00
|
|
|
sharing file mappings only works reliable using named
|
2001-09-28 00:39:50 +02:00
|
|
|
file mapping on 9x.
|
|
|
|
*/
|
|
|
|
if ((flags & MAP_PRIVATE)
|
|
|
|
&& (wincap.has_working_copy_on_write () || fd != -1))
|
|
|
|
access = FILE_MAP_COPY;
|
|
|
|
|
2003-09-09 11:41:18 +02:00
|
|
|
caddr_t base = (caddr_t)addr;
|
2003-07-03 22:53:26 +02:00
|
|
|
/* This shifts the base address to the next lower 64K boundary.
|
|
|
|
The offset is re-added when evaluating the return value. */
|
|
|
|
if (base)
|
|
|
|
base -= off - gran_off;
|
2003-07-26 06:53:59 +02:00
|
|
|
|
2003-07-03 22:53:26 +02:00
|
|
|
HANDLE h = fh->mmap (&base, gran_len, access, flags, gran_off);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-10-05 15:07:02 +02:00
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2000-10-05 15:07:02 +02:00
|
|
|
return MAP_FAILED;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
/* At this point we should have a successfully mmapped area.
|
|
|
|
Now it's time for bookkeeping stuff. */
|
2001-02-05 13:36:41 +01:00
|
|
|
if (fd == -1)
|
|
|
|
gran_len = PAGE_CNT (gran_len) * getpagesize ();
|
2001-01-15 20:42:33 +01:00
|
|
|
mmap_record mmap_rec (fd, h, access, gran_off, gran_len, base);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Get list of mmapped areas for this fd, create a new one if
|
|
|
|
one does not exist yet.
|
|
|
|
*/
|
2003-02-07 21:57:30 +01:00
|
|
|
if (!map_list)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* Create a new one */
|
2003-09-04 12:27:51 +02:00
|
|
|
map_list = mmapped_areas->add_list (fd);
|
2003-02-07 21:57:30 +01:00
|
|
|
if (!map_list)
|
2001-09-03 04:13:05 +02:00
|
|
|
{
|
|
|
|
fh->munmap (h, base, gran_len);
|
|
|
|
set_errno (ENOMEM);
|
|
|
|
syscall_printf ("-1 = mmap(): ENOMEM");
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2001-09-03 04:13:05 +02:00
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert into the list */
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record *rec = map_list->add_record (mmap_rec, off,
|
|
|
|
len > gran_len ? gran_len : len);
|
|
|
|
if (!rec)
|
|
|
|
{
|
|
|
|
fh->munmap (h, base, gran_len);
|
|
|
|
set_errno (ENOMEM);
|
|
|
|
syscall_printf ("-1 = mmap(): ENOMEM");
|
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
|
|
|
return MAP_FAILED;
|
|
|
|
}
|
|
|
|
|
2003-02-25 13:46:39 +01:00
|
|
|
caddr_t ret = rec->get_address () + (off - gran_off);
|
2001-01-15 20:42:33 +01:00
|
|
|
syscall_printf ("%x = mmap() succeeded", ret);
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
|
2001-01-15 20:42:33 +01:00
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-09-09 11:41:18 +02:00
|
|
|
extern "C" void *
|
|
|
|
mmap (void *addr, size_t len, int prot, int flags, int fd, _off_t off)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
2003-04-01 18:11:41 +02:00
|
|
|
return mmap64 (addr, len, prot, flags, fd, (_off64_t)off);
|
2002-02-25 18:47:51 +01:00
|
|
|
}
|
|
|
|
|
2003-07-05 20:59:35 +02:00
|
|
|
/* munmap () removes all mmapped pages between addr and addr+len. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-03-09 21:10:25 +01:00
|
|
|
extern "C" int
|
2003-09-09 11:41:18 +02:00
|
|
|
munmap (void *addr, size_t len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-07-21 15:06:49 +02:00
|
|
|
syscall_printf ("munmap (addr %x, len %u)", addr, len);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-07-05 20:59:35 +02:00
|
|
|
/* Error conditions according to SUSv3 */
|
|
|
|
if (!addr || ((DWORD)addr % getpagesize ()) || !len
|
2004-02-25 11:54:31 +01:00
|
|
|
|| check_invalid_virtual_addr (addr, len))
|
2001-01-15 20:42:33 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
syscall_printf ("-1 = munmap(): Invalid parameters");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
SetResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
|
2000-11-15 07:27:48 +01:00
|
|
|
if (mmapped_areas == NULL)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-11-15 07:27:48 +01:00
|
|
|
syscall_printf ("-1 = munmap(): mmapped_areas == NULL");
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
|
2003-07-05 20:59:35 +02:00
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-07-05 20:59:35 +02:00
|
|
|
/* Iterate through the map, unmap pages between addr and addr+len
|
|
|
|
in all maps. */
|
2003-09-04 12:27:51 +02:00
|
|
|
list *map_list;
|
|
|
|
for (int list_idx = 0;
|
|
|
|
(map_list = mmapped_areas->get_list (list_idx));
|
|
|
|
++list_idx)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
long record_idx = -1;
|
|
|
|
caddr_t u_addr;
|
|
|
|
DWORD u_len;
|
2003-07-05 20:59:35 +02:00
|
|
|
|
2003-09-09 11:41:18 +02:00
|
|
|
while ((record_idx = map_list->search_record((caddr_t)addr, len, u_addr,
|
2003-11-28 21:55:59 +01:00
|
|
|
u_len, record_idx)) >= 0)
|
2003-09-04 12:27:51 +02:00
|
|
|
{
|
|
|
|
mmap_record *rec = map_list->get_record (record_idx);
|
|
|
|
if (rec->unmap_pages (u_addr, u_len))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-26 10:50:12 +02:00
|
|
|
/* The whole record has been unmapped, so we now actually
|
2003-11-28 21:55:59 +01:00
|
|
|
unmap it from the system in full length... */
|
2003-09-04 12:27:51 +02:00
|
|
|
fhandler_base *fh = rec->alloc_fh ();
|
2003-09-26 10:50:12 +02:00
|
|
|
fh->munmap (rec->get_handle (),
|
2003-11-28 21:55:59 +01:00
|
|
|
rec->get_address (),
|
2003-09-26 10:50:12 +02:00
|
|
|
rec->get_size ());
|
2003-09-04 12:27:51 +02:00
|
|
|
rec->free_fh (fh);
|
2000-10-05 15:07:02 +02:00
|
|
|
|
2003-09-26 10:50:12 +02:00
|
|
|
/* ...and delete the record. */
|
2003-09-04 12:27:51 +02:00
|
|
|
if (map_list->del_record (record_idx--))
|
|
|
|
{
|
|
|
|
/* Yay, the last record has been removed from the list,
|
|
|
|
we can remove the list now, too. */
|
|
|
|
mmapped_areas->del_list (list_idx--);
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-01-15 20:42:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
|
2003-07-05 20:59:35 +02:00
|
|
|
syscall_printf ("0 = munmap(): %x", addr);
|
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sync file with memory. Ignore flags for now. */
|
|
|
|
|
2003-03-09 21:10:25 +01:00
|
|
|
extern "C" int
|
2003-09-09 11:41:18 +02:00
|
|
|
msync (void *addr, size_t len, int flags)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-07-21 15:06:49 +02:00
|
|
|
syscall_printf ("addr = %x, len = %u, flags = %x",
|
2000-02-17 20:38:33 +01:00
|
|
|
addr, len, flags);
|
|
|
|
|
2000-10-05 15:07:02 +02:00
|
|
|
/* However, check flags for validity. */
|
|
|
|
if ((flags & ~(MS_ASYNC | MS_SYNC | MS_INVALIDATE))
|
|
|
|
|| ((flags & MS_ASYNC) && (flags & MS_SYNC)))
|
|
|
|
{
|
|
|
|
syscall_printf ("-1 = msync(): Invalid flags");
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
SetResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
|
2000-10-05 15:07:02 +02:00
|
|
|
/* Check if a mmap'ed area was ever created */
|
2000-11-15 07:27:48 +01:00
|
|
|
if (mmapped_areas == NULL)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
2000-11-15 07:27:48 +01:00
|
|
|
syscall_printf ("-1 = msync(): mmapped_areas == NULL");
|
2000-10-05 15:07:02 +02:00
|
|
|
set_errno (EINVAL);
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
|
2000-10-05 15:07:02 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Iterate through the map, looking for the mmapped area.
|
|
|
|
Error if not found. */
|
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
list *map_list;
|
|
|
|
for (int list_idx = 0;
|
|
|
|
(map_list = mmapped_areas->get_list (list_idx));
|
|
|
|
++list_idx)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record *rec;
|
|
|
|
for (int record_idx = 0;
|
2003-11-28 21:55:59 +01:00
|
|
|
(rec = map_list->get_record (record_idx));
|
2003-09-04 12:27:51 +02:00
|
|
|
++record_idx)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
2003-09-09 11:41:18 +02:00
|
|
|
if (rec->access ((caddr_t)addr))
|
2001-02-05 13:36:41 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
/* Check whole area given by len. */
|
|
|
|
for (DWORD i = getpagesize (); i < len; ++i)
|
2003-09-09 11:41:18 +02:00
|
|
|
if (!rec->access ((caddr_t)addr + i))
|
2003-09-04 12:27:51 +02:00
|
|
|
goto invalid_address_range;
|
|
|
|
fhandler_base *fh = rec->alloc_fh ();
|
2003-09-09 11:41:18 +02:00
|
|
|
int ret = fh->msync (rec->get_handle (), (caddr_t)addr, len,
|
2003-11-28 21:55:59 +01:00
|
|
|
flags);
|
2003-09-04 12:27:51 +02:00
|
|
|
rec->free_fh (fh);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
syscall_printf ("%d = msync(): %E", ret);
|
|
|
|
else
|
|
|
|
syscall_printf ("0 = msync()");
|
|
|
|
|
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK,
|
|
|
|
"msync");
|
|
|
|
return 0;
|
2002-03-11 21:23:09 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-10-05 15:07:02 +02:00
|
|
|
|
2002-03-11 21:23:09 +01:00
|
|
|
invalid_address_range:
|
2000-10-05 15:07:02 +02:00
|
|
|
/* SUSv2: Return code if indicated memory was not mapped is ENOMEM. */
|
|
|
|
set_errno (ENOMEM);
|
|
|
|
syscall_printf ("-1 = msync(): ENOMEM");
|
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
|
2000-10-05 15:07:02 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2003-09-09 11:41:18 +02:00
|
|
|
/* Set memory protection */
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
mprotect (void *addr, size_t len, int prot)
|
|
|
|
{
|
|
|
|
DWORD old_prot;
|
|
|
|
DWORD new_prot = 0;
|
|
|
|
|
|
|
|
syscall_printf ("mprotect (addr %x, len %u, prot %x)", addr, len, prot);
|
|
|
|
|
|
|
|
if (!wincap.virtual_protect_works_on_shared_pages ()
|
|
|
|
&& addr >= (caddr_t)0x80000000 && addr <= (caddr_t)0xBFFFFFFF)
|
|
|
|
{
|
|
|
|
syscall_printf ("0 = mprotect (9x: No VirtualProtect on shared memory)");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (prot)
|
|
|
|
{
|
|
|
|
case PROT_READ | PROT_WRITE | PROT_EXEC:
|
|
|
|
case PROT_WRITE | PROT_EXEC:
|
|
|
|
new_prot = PAGE_EXECUTE_READWRITE;
|
|
|
|
break;
|
|
|
|
case PROT_READ | PROT_WRITE:
|
|
|
|
case PROT_WRITE:
|
|
|
|
new_prot = PAGE_READWRITE;
|
|
|
|
break;
|
|
|
|
case PROT_READ | PROT_EXEC:
|
|
|
|
new_prot = PAGE_EXECUTE_READ;
|
|
|
|
break;
|
|
|
|
case PROT_READ:
|
|
|
|
new_prot = PAGE_READONLY;
|
|
|
|
break;
|
|
|
|
case PROT_EXEC:
|
|
|
|
new_prot = PAGE_EXECUTE;
|
|
|
|
break;
|
|
|
|
case PROT_NONE:
|
|
|
|
new_prot = PAGE_NOACCESS;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
syscall_printf ("-1 = mprotect (): invalid prot value");
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (VirtualProtect (addr, len, new_prot, &old_prot) == 0)
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
syscall_printf ("-1 = mprotect (): %E");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
syscall_printf ("0 = mprotect ()");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-10-05 15:07:02 +02:00
|
|
|
/*
|
|
|
|
* Base implementation:
|
|
|
|
*
|
|
|
|
* `mmap' returns ENODEV as documented in SUSv2.
|
|
|
|
* In contrast to the global function implementation, the member function
|
|
|
|
* `mmap' has to return the mapped base address in `addr' and the handle to
|
|
|
|
* the mapping object as return value. In case of failure, the fhandler
|
|
|
|
* mmap has to close that handle by itself and return INVALID_HANDLE_VALUE.
|
|
|
|
*
|
|
|
|
* `munmap' and `msync' get the handle to the mapping object as first parameter
|
|
|
|
* additionally.
|
|
|
|
*/
|
|
|
|
HANDLE
|
|
|
|
fhandler_base::mmap (caddr_t *addr, size_t len, DWORD access,
|
2003-04-01 18:11:41 +02:00
|
|
|
int flags, _off64_t off)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
|
|
|
set_errno (ENODEV);
|
|
|
|
return INVALID_HANDLE_VALUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_base::munmap (HANDLE h, caddr_t addr, size_t len)
|
|
|
|
{
|
|
|
|
set_errno (ENODEV);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_base::msync (HANDLE h, caddr_t addr, size_t len, int flags)
|
|
|
|
{
|
|
|
|
set_errno (ENODEV);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
bool
|
2001-01-11 13:33:12 +01:00
|
|
|
fhandler_base::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
|
|
|
|
DWORD size, void *address)
|
|
|
|
{
|
|
|
|
set_errno (ENODEV);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-10-05 15:07:02 +02:00
|
|
|
/* Implementation for disk files. */
|
|
|
|
HANDLE
|
|
|
|
fhandler_disk_file::mmap (caddr_t *addr, size_t len, DWORD access,
|
2003-04-01 18:11:41 +02:00
|
|
|
int flags, _off64_t off)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
|
|
|
DWORD protect;
|
|
|
|
|
2003-02-07 21:57:30 +01:00
|
|
|
switch (access)
|
|
|
|
{
|
|
|
|
case FILE_MAP_WRITE:
|
2003-03-09 21:31:07 +01:00
|
|
|
protect = PAGE_READWRITE;
|
|
|
|
break;
|
2003-02-07 21:57:30 +01:00
|
|
|
case FILE_MAP_READ:
|
2003-03-09 21:31:07 +01:00
|
|
|
protect = PAGE_READONLY;
|
|
|
|
break;
|
2003-02-07 21:57:30 +01:00
|
|
|
default:
|
|
|
|
protect = PAGE_WRITECOPY;
|
|
|
|
break;
|
|
|
|
}
|
2000-10-05 15:07:02 +02:00
|
|
|
|
2001-07-10 23:04:14 +02:00
|
|
|
HANDLE h;
|
|
|
|
|
|
|
|
/* On 9x/ME try first to open the mapping by name when opening a
|
|
|
|
shared file object. This is needed since 9x/ME only shares
|
|
|
|
objects between processes by name. What a mess... */
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (wincap.share_mmaps_only_by_name ()
|
2001-07-10 23:04:14 +02:00
|
|
|
&& get_handle () != INVALID_HANDLE_VALUE
|
|
|
|
&& !(access & FILE_MAP_COPY))
|
|
|
|
{
|
|
|
|
/* Grrr, the whole stuff is just needed to try to get a reliable
|
2001-09-03 04:13:05 +02:00
|
|
|
mapping of the same file. Even that uprising isn't bullet
|
2001-07-10 23:04:14 +02:00
|
|
|
proof but it does it's best... */
|
2003-11-15 00:40:06 +01:00
|
|
|
char namebuf[CYG_MAX_PATH];
|
2001-07-10 23:04:14 +02:00
|
|
|
cygwin_conv_to_full_posix_path (get_name (), namebuf);
|
|
|
|
for (int i = strlen (namebuf) - 1; i >= 0; --i)
|
2001-09-03 04:13:05 +02:00
|
|
|
namebuf[i] = cyg_tolower (namebuf [i]);
|
2001-07-10 23:04:14 +02:00
|
|
|
|
2001-09-28 00:39:50 +02:00
|
|
|
debug_printf ("named sharing");
|
2001-07-10 23:04:14 +02:00
|
|
|
if (!(h = OpenFileMapping (access, TRUE, namebuf)))
|
2002-09-22 05:38:57 +02:00
|
|
|
h = CreateFileMapping (get_handle (), &sec_none, protect, 0, 0, namebuf);
|
2001-07-10 23:04:14 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
h = CreateFileMapping (get_handle (), &sec_none, protect, 0,
|
|
|
|
get_handle () == INVALID_HANDLE_VALUE ? len : 0,
|
|
|
|
NULL);
|
|
|
|
if (!h)
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
syscall_printf ("-1 = mmap(): CreateFileMapping failed with %E");
|
|
|
|
return INVALID_HANDLE_VALUE;
|
|
|
|
}
|
|
|
|
|
2003-12-03 17:35:52 +01:00
|
|
|
DWORD high = off >> 32, low = off & UINT32_MAX;
|
2003-07-03 22:53:26 +02:00
|
|
|
void *base = NULL;
|
|
|
|
/* If a non-zero address is given, try mapping using the given address first.
|
|
|
|
If it fails and flags is not MAP_FIXED, try again with NULL address. */
|
2003-07-04 11:06:54 +02:00
|
|
|
if (*addr)
|
2003-07-03 22:53:26 +02:00
|
|
|
base = MapViewOfFileEx (h, access, high, low, len, *addr);
|
|
|
|
if (!base && !(flags & MAP_FIXED))
|
|
|
|
base = MapViewOfFileEx (h, access, high, low, len, NULL);
|
|
|
|
debug_printf ("%x = MapViewOfFileEx (h:%x, access:%x, 0, off:%D, "
|
2003-07-26 06:53:59 +02:00
|
|
|
"len:%u, addr:%x)", base, h, access, off, len, *addr);
|
2001-02-23 10:49:19 +01:00
|
|
|
if (!base || ((flags & MAP_FIXED) && base != *addr))
|
2000-10-05 15:07:02 +02:00
|
|
|
{
|
2000-10-07 19:35:36 +02:00
|
|
|
if (!base)
|
2001-09-03 04:13:05 +02:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
syscall_printf ("-1 = mmap(): MapViewOfFileEx failed with %E");
|
|
|
|
}
|
2000-10-07 19:35:36 +02:00
|
|
|
else
|
2001-09-03 04:13:05 +02:00
|
|
|
{
|
2000-10-07 19:35:36 +02:00
|
|
|
set_errno (EINVAL);
|
2001-09-03 04:13:05 +02:00
|
|
|
syscall_printf ("-1 = mmap(): address shift with MAP_FIXED given");
|
|
|
|
}
|
2000-10-05 15:07:02 +02:00
|
|
|
CloseHandle (h);
|
|
|
|
return INVALID_HANDLE_VALUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
*addr = (caddr_t) base;
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_disk_file::munmap (HANDLE h, caddr_t addr, size_t len)
|
|
|
|
{
|
|
|
|
UnmapViewOfFile (addr);
|
|
|
|
CloseHandle (h);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_disk_file::msync (HANDLE h, caddr_t addr, size_t len, int flags)
|
|
|
|
{
|
2000-02-17 20:38:33 +01:00
|
|
|
if (FlushViewOfFile (addr, len) == 0)
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
bool
|
2001-01-11 13:33:12 +01:00
|
|
|
fhandler_disk_file::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
|
|
|
|
DWORD size, void *address)
|
|
|
|
{
|
|
|
|
/* Re-create the MapViewOfFileEx call */
|
|
|
|
void *base = MapViewOfFileEx (h, access, 0, offset, size, address);
|
2002-10-21 03:00:58 +02:00
|
|
|
if (base != address)
|
|
|
|
{
|
|
|
|
MEMORY_BASIC_INFORMATION m;
|
|
|
|
(void) VirtualQuery (address, &m, sizeof (m));
|
|
|
|
system_printf ("requested %p != %p mem alloc base %p, state %p, size %d, %E",
|
|
|
|
address, base, m.AllocationBase, m.State, m.RegionSize);
|
|
|
|
}
|
2001-01-11 13:33:12 +01:00
|
|
|
return base == address;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/*
|
|
|
|
* Call to re-create all the file mappings in a forked
|
|
|
|
* child. Called from the child in initialization. At this
|
2000-11-15 07:27:48 +01:00
|
|
|
* point we are passed a valid mmapped_areas map, and all the
|
2000-02-17 20:38:33 +01:00
|
|
|
* HANDLE's are valid for the child, but none of the
|
|
|
|
* mapped areas are in our address space. We need to iterate
|
|
|
|
* through the map, doing the MapViewOfFile calls.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int __stdcall
|
2002-03-11 18:57:22 +01:00
|
|
|
fixup_mmaps_after_fork (HANDLE parent)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
|
2000-11-15 07:27:48 +01:00
|
|
|
debug_printf ("recreate_mmaps_after_fork, mmapped_areas %p", mmapped_areas);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Check if a mmapped area was ever created */
|
2000-11-15 07:27:48 +01:00
|
|
|
if (mmapped_areas == NULL)
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Iterate through the map */
|
2003-09-04 12:27:51 +02:00
|
|
|
list *map_list;
|
|
|
|
for (int list_idx = 0;
|
|
|
|
(map_list = mmapped_areas->get_list (list_idx));
|
|
|
|
++list_idx)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
mmap_record *rec;
|
|
|
|
for (int record_idx = 0;
|
2003-11-28 21:55:59 +01:00
|
|
|
(rec = map_list->get_record (record_idx));
|
2003-09-04 12:27:51 +02:00
|
|
|
++record_idx)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-16 19:26:04 +02:00
|
|
|
|
2003-09-04 12:27:51 +02:00
|
|
|
debug_printf ("fd %d, h %x, access %x, offset %D, size %u, address %p",
|
|
|
|
rec->get_fd (), rec->get_handle (), rec->get_access (),
|
|
|
|
rec->get_offset (), rec->get_size (), rec->get_address ());
|
|
|
|
|
|
|
|
fhandler_base *fh = rec->alloc_fh ();
|
2003-12-07 23:37:12 +01:00
|
|
|
bool ret = fh->fixup_mmap_after_fork (rec->get_handle (),
|
2003-09-04 12:27:51 +02:00
|
|
|
rec->get_access (),
|
|
|
|
rec->get_offset (),
|
|
|
|
rec->get_size (),
|
|
|
|
rec->get_address ());
|
|
|
|
rec->free_fh (fh);
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
return -1;
|
|
|
|
if (rec->get_access () == FILE_MAP_COPY)
|
|
|
|
{
|
|
|
|
for (char *address = rec->get_address ();
|
|
|
|
address < rec->get_address () + rec->get_size ();
|
|
|
|
address += getpagesize ())
|
|
|
|
if (rec->access (address)
|
|
|
|
&& !ReadProcessMemory (parent, address, address,
|
|
|
|
getpagesize (), NULL))
|
|
|
|
{
|
|
|
|
DWORD old_prot;
|
|
|
|
DWORD last_error = GetLastError ();
|
|
|
|
|
|
|
|
if (last_error != ERROR_PARTIAL_COPY
|
|
|
|
&& last_error != ERROR_NOACCESS
|
|
|
|
|| !wincap.virtual_protect_works_on_shared_pages ())
|
2002-03-11 18:57:22 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
system_printf ("ReadProcessMemory failed for "
|
|
|
|
"MAP_PRIVATE address %p, %E",
|
|
|
|
rec->get_address ());
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!VirtualProtectEx (parent,
|
|
|
|
address, getpagesize (),
|
|
|
|
PAGE_READONLY, &old_prot))
|
|
|
|
{
|
|
|
|
system_printf ("VirtualProtectEx failed for "
|
|
|
|
"MAP_PRIVATE address %p, %E",
|
|
|
|
rec->get_address ());
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
BOOL ret;
|
|
|
|
DWORD dummy_prot;
|
|
|
|
|
|
|
|
ret = ReadProcessMemory (parent, address, address,
|
|
|
|
getpagesize (), NULL);
|
|
|
|
if (!VirtualProtectEx(parent,
|
|
|
|
address, getpagesize (),
|
|
|
|
old_prot, &dummy_prot))
|
|
|
|
system_printf ("WARNING: VirtualProtectEx to "
|
|
|
|
"return to previous state "
|
|
|
|
"in parent failed for "
|
|
|
|
"MAP_PRIVATE address %p, %E",
|
|
|
|
rec->get_address ());
|
|
|
|
if (!VirtualProtect (address, getpagesize (),
|
|
|
|
old_prot, &dummy_prot))
|
|
|
|
system_printf ("WARNING: VirtualProtect to copy "
|
|
|
|
"protection to child failed for"
|
|
|
|
"MAP_PRIVATE address %p, %E",
|
|
|
|
rec->get_address ());
|
|
|
|
if (!ret)
|
2003-01-14 21:40:09 +01:00
|
|
|
{
|
2003-09-04 12:27:51 +02:00
|
|
|
system_printf ("ReadProcessMemory (2nd try) "
|
|
|
|
"failed for "
|
2003-01-14 21:40:09 +01:00
|
|
|
"MAP_PRIVATE address %p, %E",
|
|
|
|
rec->get_address ());
|
|
|
|
return -1;
|
|
|
|
}
|
2002-03-11 18:57:22 +01:00
|
|
|
}
|
2003-09-04 12:27:51 +02:00
|
|
|
}
|
2000-11-15 07:27:48 +01:00
|
|
|
}
|
2003-09-04 12:27:51 +02:00
|
|
|
rec->fixup_page_map ();
|
2000-11-15 07:27:48 +01:00
|
|
|
}
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
debug_printf ("succeeded");
|
|
|
|
return 0;
|
|
|
|
}
|