← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to lib/GenTest/Reporter/Deadlock.pm

Adjustments after merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/GenTest/Reporter/Deadlock.pm
56
56
                return STATUS_SERVER_DEADLOCKED;
57
57
        }
58
58
 
59
 
        if (windows()) {
 
59
        if (osWindows()) {
60
60
                return $reporter->monitor_threaded();
61
61
        } else {
62
62
                return $reporter->monitor_nonthreaded();
155
155
        foreach my $thread ($alarm_thread, $dbh_thread) {
156
156
                next if !$thread->is_running();
157
157
                # Windows hangs when joining killed threads
158
 
                if (windows()) {
 
158
                if (osWindows()) {
159
159
                        $thread->kill('SIGKILL');
160
160
                } else {
161
161
                        $thread->kill('SIGKILL')->join();