From 9a4d574b8d4550f53036dced342022b64e508abf Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 28 Nov 2003 20:55:59 +0000 Subject: Eliminate use of sigframe and sigthread throughout. * Makefile.in (DLL_OFILES): Add sigfe.o. Remove reliance on cygwin.def from cygwin0.dll dependency since dependence on sigfe.o implies that. Generate def file on the fly using 'gendef'. * configure.in: Don't auto-generate cygwin.def. * configure: Regenerate. * cygwin.din: Add SIGFE stuff where appropriate. * dcrt0.cc (dll_crt0_1): Initialize cygwin tls early in process startup. Set _main_tls to address of the main thread's cygwin tls. * debug.h: Remove now unneeded WFSO and WFMO declarations. * exceptions.cc (_last_thread): Define. (set_thread_state_for_signals): New function. (reset_thread_exception_for_signals): Ditto. (init_thread_for_signals): Ditto. (delete_thread_for_signals): Ditto. (capture_thread_for_signals): Ditto. (handle_exceptions): Set return address explicitly for exceptions prior to calling sig_send. (interrupt_on_return): Eliminate. (setup_handler): Add preliminary implementation for dealing with thread-specific signals by querying _main_tls. (signal_exit): Use cygthread::main_thread_id instead of mainthread.id. (call_signal_handler_now): For now, just handle the main thread. * fork.cc (vfork): Save and restore main _my_tls. * gendef: New file. Generates def file and sigfe.s file. * gentls_offsets: New file. Generates offsets for perl to use in sigfe.s. * how-signals-work.txt: Mention that info is obsolete. * init.cc (dll_entry): Initialize cygwin tls storage here. * miscfuncs.cc (low_priority_sleep): Make a C function for easier calling from asm. * perthread.h (vfork_save::tls): New element. * signal.cc (nanosleep): Replace previous use of sigframe.call_signal_handler_now with straight call to call_signal_handler_now. (abort): Ditto. * syscalls.cc (readv): Ditto. * termios.cc (tcsetattr): Ditto. * wait.cc (wait4): Ditto. * sigproc.cc (sig_dispatch_pending): Ditto. (sig_send): Ditto. * sigproc.h: Declare call_signal_handler_now. * thread.cc (pthread::thread_init_wrapper): Initialize cygwin tls. Remove obsolete and unworking signal stuff. * thread.h (verifyable_object::sigs): Eliminate. (verifyable_object::sigmask): Eliminate. (verifyable_object::sigtodo): Eliminate. (verifyable_object::exit): Make attribute noreturn. (verifyable_object::thread_init_wrapper): Ditto. (pthread_null::exit): Ditto. * winbase.h (__stackbase): Always define. * winsup.h (low_priority_sleep): Declare as a "C" function. * include/cygwin/version.h: Bump API version to reflect sigwait export. * include/sys/queue.h: Protect SLIST_ENTRY from previous declaration. * signal.cc (sigwait): Implement. * select.cc (fhandler_base::ready_for_read): Add debugging output. * devices.h: Define more device pointers via their storage. * devices.in: Don't parse things like /dev/inet/tcp, as they really have no meaning. * devices.cc: Regenerate. * gendevices: Set proper protection for output file. * cygtls.h: New file. * gendef: New file. * gentls_offsets: New file. * tlsoffsets.h: New file. Autogenerated. * config/i386/longjmp.c: Remove. File subsumed by gendef output. * config/i386/makefrag: Remove obsolete file. * fhandler.cc: Remove spurious access_worker declaration. * spawn.cc (spawnve): Make debugging output more accurate. * cygwin-gperf: Remove. * devices.cc: Remove. --- winsup/cygwin/mmap.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'winsup/cygwin/mmap.cc') diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index fe679788c..a553345fa 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -39,9 +39,9 @@ static fhandler_disk_file fh_paging_file; 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(). - + The class structure: - + 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. @@ -318,13 +318,13 @@ list::add_record (mmap_record r, _off64_t off, DWORD len) { mmap_record *new_recs; if (maxrecs == 0) - new_recs = (mmap_record *) + new_recs = (mmap_record *) cmalloc (HEAP_MMAP, 5 * sizeof (mmap_record)); else new_recs = (mmap_record *) crealloc (recs, (maxrecs + 5) * sizeof (mmap_record)); if (!new_recs) - return NULL; + return NULL; maxrecs += 5; recs = new_recs; } @@ -425,11 +425,11 @@ map::add_list (int fd) { list *new_lists; if (maxlists == 0) - new_lists = (list *) cmalloc (HEAP_MMAP, 5 * sizeof (list)); + new_lists = (list *) cmalloc (HEAP_MMAP, 5 * sizeof (list)); else new_lists = (list *) crealloc (lists, (maxlists + 5) * sizeof (list)); if (!new_lists) - return NULL; + return NULL; maxlists += 5; lists = new_lists; } @@ -444,7 +444,7 @@ map::del_list (int i) { lists[i].free_recs (); for (; i < nlists - 1; i++) - lists[i] = lists[i + 1]; + lists[i] = lists[i + 1]; nlists--; } } @@ -668,16 +668,16 @@ munmap (void *addr, size_t len) DWORD u_len; while ((record_idx = map_list->search_record((caddr_t)addr, len, u_addr, - u_len, record_idx)) >= 0) + u_len, record_idx)) >= 0) { mmap_record *rec = map_list->get_record (record_idx); if (rec->unmap_pages (u_addr, u_len)) { /* The whole record has been unmapped, so we now actually - unmap it from the system in full length... */ + unmap it from the system in full length... */ fhandler_base *fh = rec->alloc_fh (); fh->munmap (rec->get_handle (), - rec->get_address (), + rec->get_address (), rec->get_size ()); rec->free_fh (fh); @@ -735,7 +735,7 @@ msync (void *addr, size_t len, int flags) { mmap_record *rec; for (int record_idx = 0; - (rec = map_list->get_record (record_idx)); + (rec = map_list->get_record (record_idx)); ++record_idx) { if (rec->access ((caddr_t)addr)) @@ -746,7 +746,7 @@ msync (void *addr, size_t len, int flags) goto invalid_address_range; fhandler_base *fh = rec->alloc_fh (); int ret = fh->msync (rec->get_handle (), (caddr_t)addr, len, - flags); + flags); rec->free_fh (fh); if (ret) @@ -1012,7 +1012,7 @@ fixup_mmaps_after_fork (HANDLE parent) { mmap_record *rec; for (int record_idx = 0; - (rec = map_list->get_record (record_idx)); + (rec = map_list->get_record (record_idx)); ++record_idx) { -- cgit v1.2.3