f6936c48f3
* cygwin.din: Make clock SIGFE. Add clock_gettime, sigwaitinfo, timer_create, timer_delete, timer_settime. * include/cygwin/version.h: Reflect above additions. * fork.cc (fork_child): Call fixup_timers_after_fork. * signal.cc (sigwait): Remove unused variable. * timer.cc: New file. (clock_gettime): Define new function. (timer_tracker): Define new struct used by timer functions. (timer_tracker::timer_tracker): New function. (to_us): New function. (timer_thread): New function. (timer_tracker::settime): New function. (timer_create): New function. (timer_settime): New function. (timer_delete): New function. (fixup_timers_after_fork): New function. * cygthread.cc: Bump thread count. * signal.cc (sigwaitinfo): Define new function. (sigwait): Redefine based on sigwaitinfo. * include/cygwin/signal.h (sigwaitinfo): Declare. (sigwait): Ditto. * dtable.cc (dtable::vfork_parent_restore): Avoid double close of ctty when ctty == ctty_on_hold. * cygtls.h (_threadinfo::threadkill): New element. (_threadinfo::set_threadkill): Declare new function. (_threadinfo::reset_threadkill): Declare new function. * dcrt0.cc (dcrt0_1): Call here so that it will be possible to attach to running process with #(*& Windows Me/9x. (initial_env): Try to initialize strace if uninitialized. * gendef: Don't zero signal if threadkill is set since that will happen in the called function. * signal.cc (sigwait): Ensure cleanup in error conditions. * sigproc.cc (sig_send): Clear packet mask storage. (wait_subproc): Fill in child exit code in siginfo_t structure. * thread.cc (pthread_kill): Set threadkill flag. * tlsoffsets.h: Regenerate. Throughout, use siginfo_t to fill out all signal information for "kernel" signals. * cygtls.h (_threadinfo::set_siginfo): Declare new function. * cygtls.cc (_threadinfo::set_siginfo): Define new function. * dcrt0.cc (do_exit): Accommodate siginfo_t considerations. * exceptions.cc (handle_exceptions): Ditto. (sig_handle_tty_stop): Ditto. (ctrl_c_handler): Use killsys() to send signal. (sigpacket::process): Rename from sig_handle. Use siginfo_t field from sigpacket for everything. (tty_min::kill_pgrp): Accommodate siginfo_t considerations. (fhandler_termios::bg_check): Ditto. * fhandler_tty.cc (fhandler_tty_slave::ioctl): Use killsys() to send signal. * signal.cc (kill_worker): Rewrite to use siginfo_t second argument. (kill_pgrp): Ditto. (kill0): Define new function pulled from kill(). (kill): Rewrite as frontend to kill0. (killsys): Define new function. * sigproc.cc (sigelem): Eliminate. (sigpacket): Move to sigproc.h. Subsume sigelem. (pending_signals): Use sigpacket rather than sigelem for everything. (sig_clear): Ditto. (wait_sig): Ditto. (sig_send): Rewrite to use siginfo_t argument. (sig_send): New function wratpper to sig_send with siginfo_t argument. (wait_subproc): Accommodate siginfo_t considerations. * thread.cc (pthread_kill): Ditto. * sigproc.h (sigpacket): Move here. (sigpacket::process): Declare "new" function. (sig_handle): Eliminate declaration. (sig_send): Declare with new paramaters. (killsys): Declare new function. (kill_pgrp): Declare. * winsup.h: Move some signal-specific stuff to sigproc.h. * include/cygwin/signal.h: Tweak some siginfo_t stuff.
226 lines
4.1 KiB
Perl
Executable File
226 lines
4.1 KiB
Perl
Executable File
#!/usr/bin/perl
|
|
use strict;
|
|
my $in = shift;
|
|
my $tls_offsets = shift;
|
|
my $out = shift;
|
|
my $sigfe = shift;
|
|
|
|
$main::first = 0;
|
|
if (!defined($in) || !defined($out) || !defined($sigfe)) {
|
|
die "usage: $0 deffile.in cygtls.h deffile.def sigfe.s\n";
|
|
}
|
|
|
|
require $tls_offsets;
|
|
|
|
open(IN, $in) or die "$0: couldn't open \"$in\" - $!\n";
|
|
my @top = ();
|
|
while (<IN>) {
|
|
push(@top, $_);
|
|
last if /^\s*exports\s*$/i;
|
|
}
|
|
my $libline = <IN>;
|
|
my @in = <IN>;
|
|
close(IN);
|
|
|
|
my %sigfe = ();
|
|
my @data = ();
|
|
my @nosigfuncs = ();
|
|
my @out = ();
|
|
for (@in) {
|
|
/\sDATA$/o and do {
|
|
push(@data, $_);
|
|
next;
|
|
};
|
|
chomp;
|
|
if (/=/o) {
|
|
if (s/\s+NOSIGFE\s*$//) {
|
|
} elsif (s/ SIGFE$//) {
|
|
my $func = (split(' '))[2];
|
|
$sigfe{$func} = '_sigfe_' . $func;
|
|
}
|
|
} else {
|
|
my ($func, $sigfe) = m%^\s*(\S+)(?:\s+((?:NO)?SIGR?FE))?$%o;
|
|
if (defined($sigfe) && $sigfe =~ /^NO/o) {
|
|
$_ = $func;
|
|
} else {
|
|
$sigfe ||= 'sigfe';
|
|
$_ = '_' . lc($sigfe) . '_' . $func;
|
|
$sigfe{$func} = $_;
|
|
$_ = $func . ' = ' . $_;
|
|
}
|
|
}
|
|
s/(\S)\s+(\S)/$1 $2/go;
|
|
s/(\S)\s+$/$1/o;
|
|
s/^\s+(\S)/$1/o;
|
|
push(@out, $_ . "\n");
|
|
}
|
|
|
|
for (@out) {
|
|
my ($alias, $func) = /^(\S+) = (\S+)\s*$/o;
|
|
$_ = $alias . ' = ' . $sigfe{$func} . "\n"
|
|
if defined($func) && $sigfe{$func};
|
|
}
|
|
open(OUT, '>', $out) or die "$0: couldn't open \"$out\" - $!\n";
|
|
print OUT @top, @data, @out;
|
|
close OUT;
|
|
|
|
open(SIGFE, '>', $sigfe) or die "$0: couldn't open sigfe file \"$sigfe\" - $!\n";
|
|
|
|
for my $k (sort keys %sigfe) {
|
|
print SIGFE fefunc($k, $sigfe{$k});
|
|
}
|
|
close SIGFE;
|
|
|
|
sub fefunc {
|
|
my $func = '_' . shift;
|
|
my $fe = '_' . shift;
|
|
my $extra;
|
|
my $res = <<EOF;
|
|
.extern _siglist_index
|
|
.extern _siglist
|
|
.extern $func
|
|
.global $fe
|
|
$fe:
|
|
pushl \$$func
|
|
jmp __sigfe
|
|
|
|
EOF
|
|
if (!$main::first++) {
|
|
$res = <<EOF . longjmp () . $res;
|
|
.text
|
|
.global __sigbe
|
|
.global _sigreturn
|
|
.global _sigdelayed
|
|
|
|
.stabs "_sigfe:F(0,1)",36,0,0,__sigbe
|
|
__sigfe:
|
|
pushl %edx
|
|
movl %fs:4,%eax
|
|
movl \$4,%edx
|
|
xadd %edx,$tls::stackptr(%eax)
|
|
leal __sigbe,%eax
|
|
xchg %eax,8(%esp)
|
|
movl %eax,(%edx)
|
|
popl %edx
|
|
ret
|
|
|
|
.stabs "_sigbe:F(0,1)",36,0,0,__sigbe
|
|
__sigbe:
|
|
pushl %eax
|
|
pushl %edx
|
|
movl \$-4,%edx
|
|
1: movl %fs:4,%eax
|
|
xadd %edx,$tls::stackptr(%eax)
|
|
xorl %eax,%eax
|
|
lock xchg %eax,-4(%edx)
|
|
testl %eax,%eax
|
|
jnz 2f
|
|
call _low_priority_sleep
|
|
xorl %edx,%edx
|
|
jmp 1b
|
|
2: xchg %eax,4(%esp)
|
|
popl %edx
|
|
ret
|
|
|
|
.stabs "sigreturn:F(0,1)",36,0,0,_sigreturn
|
|
_sigreturn:
|
|
addl \$4,%esp # Remove argument
|
|
call _set_process_mask\@4
|
|
|
|
movl %fs:4,%eax
|
|
|
|
cmpl \$0,$tls::sig(%eax) # Did a signal come in?
|
|
jnz 3f # Yes, if non-zero
|
|
|
|
1: popl %edx # saved errno
|
|
testl %edx,%edx # Is it < 0
|
|
jl 2f # yup. ignore it
|
|
movl $tls::errno_addr(%eax),%eax
|
|
movl %edx,(%eax)
|
|
2: popl %eax
|
|
popl %ebx
|
|
popl %ecx
|
|
popl %edx
|
|
popl %edi
|
|
popl %esi
|
|
popf
|
|
popl %ebp
|
|
jmp __sigbe
|
|
|
|
.stabs "sigdelayed:F(0,1)",36,0,0,_sigdelayed
|
|
_sigdelayed:
|
|
pushl %ebp
|
|
movl %esp,%ebp
|
|
pushf
|
|
pushl %esi
|
|
pushl %edi
|
|
pushl %edx
|
|
pushl %ecx
|
|
pushl %ebx
|
|
pushl %eax
|
|
movl %fs:4,%ebx
|
|
pushl $tls::saved_errno(%ebx) # saved errno
|
|
3: pushl $tls::oldmask(%ebx) # oldmask
|
|
pushl $tls::sig(%ebx) # signal argument
|
|
pushl \$_sigreturn
|
|
|
|
call _reset_signal_arrived\@0
|
|
pushl $tls::func(%ebx) # signal func
|
|
pushl $tls::newmask(%ebx) # newmask - eaten by set_process_mask
|
|
|
|
call _set_process_mask\@4
|
|
cmpl \$0,$tls::threadkill(%ebx)#pthread_kill signal?
|
|
jnz 4f #yes. Callee clears signal number
|
|
movl \$0,$tls::sig(%ebx) # zero the signal number as a
|
|
# flag to the signal handler thread
|
|
# that it is ok to set up sigsave
|
|
4: popl %ebx
|
|
jmp *%ebx
|
|
|
|
EOF
|
|
}
|
|
return $res;
|
|
}
|
|
|
|
sub longjmp {
|
|
return <<EOF;
|
|
|
|
.globl _longjmp
|
|
|
|
_longjmp:
|
|
pushl %ebp
|
|
movl %esp,%ebp
|
|
movl 8(%ebp),%edi
|
|
movl 12(%ebp),%eax
|
|
testl %eax,%eax
|
|
jne 0f
|
|
incl %eax
|
|
0:
|
|
movl %eax,0(%edi)
|
|
movl 24(%edi),%ebp
|
|
pushfl
|
|
popl %ebx
|
|
movw 42(%edi),%ax
|
|
movw %ax,%ss
|
|
movl 28(%edi),%esp
|
|
pushl 32(%edi)
|
|
pushl %ebx
|
|
movw 36(%edi),%ax
|
|
movw %ax,%es
|
|
movw 40(%edi),%ax
|
|
movw %ax,%gs
|
|
movl %fs:4,%eax
|
|
leal ($tls::stack)(%eax),%edx
|
|
movl %edx,($tls::stackptr)(%eax)
|
|
movl 0(%edi),%eax
|
|
movl 4(%edi),%ebx
|
|
movl 8(%edi),%ecx
|
|
movl 12(%edi),%edx
|
|
movl 16(%edi),%esi
|
|
movl 20(%edi),%edi
|
|
popfl
|
|
ret
|
|
|
|
EOF
|
|
}
|