From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 9 Nov 2005 00:16:08 +0000 (+0000)
Subject: issue #5601
X-Git-Tag: 1.2.0-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33c15f19fefbd1a5f72f5f4c0816b25a662d95f7;p=thirdparty%2Fasterisk.git

issue #5601


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/ChangeLog b/ChangeLog
index f6f9190c69..94d53e98d8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-08  Kevin P. Fleming  <kpfleming@digium.com>
 
+	* res/res_features.c (ast_bridge_call_thread_launch): set SCHED_RR separately from thread creation, so it won't fail when running as non-root (issue #5601, different fix)
+
 	* pbx.c (pbx_builtin_pushvar_helper): add new API function for setting variables that can exist multiple times (issue #2720)
 	* apps/Makefile (APPS): add app_stack (issue #2720)
 	* apps/app_stack.c: new applications (issue #2720)
diff --git a/res/res_features.c b/res/res_features.c
index 92137a65f4..04cccc2653 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -244,13 +244,14 @@ static void ast_bridge_call_thread_launch(void *data)
 {
 	pthread_t thread;
 	pthread_attr_t attr;
-	int result;
+	struct sched_param sched;
 
-	result = pthread_attr_init(&attr);
-	pthread_attr_setschedpolicy(&attr, SCHED_RR);
+	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	result = ast_pthread_create(&thread, &attr,ast_bridge_call_thread, data);
-	result = pthread_attr_destroy(&attr);
+	ast_pthread_create(&thread, &attr,ast_bridge_call_thread, data);
+	pthread_attr_destroy(&attr);
+	memset(&sched, 0, sizeof(sched));
+	pthread_setschedparam(thread, SCHED_RR, &sched);
 }