1*4882a593SmuzhiyunFrom 2bb8b79b41eed87b843eb0159d6fa21a92c4c152 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 27 Jul 2017 08:02:51 -0700 4*4882a593SmuzhiyunSubject: [PATCH] Replace pthread_yield with sched_yield 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunOn Linux pthead_yield is same as sched_yield implementation wise 7*4882a593Smuzhiyunand sched_yield is available on all libc 8*4882a593Smuzhiyunimplementations on Linux 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 11*4882a593SmuzhiyunUpstream-Status: Pending 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- 14*4882a593Smuzhiyun tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- 15*4882a593Smuzhiyun 2 files changed, 5 insertions(+), 4 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 18*4882a593Smuzhiyunindex 19b3289390..4d0cdf8b5f 100644 19*4882a593Smuzhiyun--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 20*4882a593Smuzhiyun+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 21*4882a593Smuzhiyun@@ -35,7 +35,7 @@ 22*4882a593Smuzhiyun #include "tst_qvariant_common.h" 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun #ifdef Q_OS_LINUX 25*4882a593Smuzhiyun-# include <pthread.h> 26*4882a593Smuzhiyun+# include <sched.h> 27*4882a593Smuzhiyun #endif 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun #include <algorithm> 30*4882a593Smuzhiyun@@ -369,7 +369,7 @@ protected: 31*4882a593Smuzhiyun const char *nm = name.constData(); 32*4882a593Smuzhiyun int tp = qRegisterMetaType<Bar>(nm); 33*4882a593Smuzhiyun #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) 34*4882a593Smuzhiyun- pthread_yield(); 35*4882a593Smuzhiyun+ sched_yield(); 36*4882a593Smuzhiyun #endif 37*4882a593Smuzhiyun QMetaType info(tp); 38*4882a593Smuzhiyun if (!info.isValid()) { 39*4882a593Smuzhiyundiff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 40*4882a593Smuzhiyunindex e397e80fe0..cdb7893e56 100644 41*4882a593Smuzhiyun--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 42*4882a593Smuzhiyun+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 43*4882a593Smuzhiyun@@ -78,6 +78,7 @@ 44*4882a593Smuzhiyun #include <stdlib.h> 45*4882a593Smuzhiyun #include <sys/stat.h> 46*4882a593Smuzhiyun #include <unistd.h> 47*4882a593Smuzhiyun+#include <sched.h> 48*4882a593Smuzhiyun #endif 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun #include <memory> 51*4882a593Smuzhiyun@@ -2200,8 +2201,8 @@ public slots: 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun #if defined(Q_OS_MAC) 54*4882a593Smuzhiyun pthread_yield_np(); 55*4882a593Smuzhiyun-#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID 56*4882a593Smuzhiyun- pthread_yield(); 57*4882a593Smuzhiyun+#elif defined Q_OS_LINUX 58*4882a593Smuzhiyun+ sched_yield(); 59*4882a593Smuzhiyun #endif 60*4882a593Smuzhiyun if (!sock->waitForConnected()) { 61*4882a593Smuzhiyun networkTimeout = true; 62