summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2010-12-13 12:19:30 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2010-12-13 12:19:30 +0100
commit0611bf22031283a6b459223eec199f0c0c7ae606 (patch)
treecaa89834fdf3ced0f320f17115472e03e2a68e0d /dbug
parent6330815a0ce15311cb90781d633b4c8cdfd34834 (diff)
downloadmariadb-git-0611bf22031283a6b459223eec199f0c0c7ae606.tar.gz
Bug #58426 Crashing tests not failing as they are supposed to on Solaris 10 debug
On this platform we seem to get lots of other signals while waiting for SIGKILL to be delivered. Solution: use sigsuspend(<all signals blocked>) dbug/dbug.c: New function _db_suicide_() which does kill(myself, -9) and then waits forever. include/my_dbug.h: Let DBUG_SUICE wait forever until the KILL signal is delivered, and process dies.
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index fecdd4f8a6c..06a9f7b4bac 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -2276,6 +2276,25 @@ void _db_flush_()
}
+#ifndef __WIN__
+void _db_suicide_()
+{
+ int retval;
+ sigset_t new_mask;
+ sigfillset(&new_mask);
+
+ fprintf(stderr, "SIGKILL myself\n");
+ fflush(stderr);
+
+ retval= kill(getpid(), SIGKILL);
+ assert(retval == 0);
+ retval= sigsuspend(&new_mask);
+ fprintf(stderr, "sigsuspend returned %d errno %d \n", retval, errno);
+ assert(FALSE); /* With full signal mask, we should never return here. */
+}
+#endif /* ! __WIN__ */
+
+
void _db_lock_file_()
{
CODE_STATE *cs=0;