提交 fd557f4c authored 作者: Anthony Minessale's avatar Anthony Minessale

fix

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@943 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 322f5a15
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
#include "jthread.h" #include "jthread.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
JThread::JThread() JThread::JThread()
{ {
...@@ -48,18 +51,24 @@ int JThread::Start() ...@@ -48,18 +51,24 @@ int JThread::Start()
{ {
if (!runningmutex.IsInitialized()) if (!runningmutex.IsInitialized())
{ {
if (runningmutex.Init() < 0) if (runningmutex.Init() < 0) {
printf("STUPID 1\n");
return ERR_JTHREAD_CANTINITMUTEX; return ERR_JTHREAD_CANTINITMUTEX;
}
} }
if (!continuemutex.IsInitialized()) if (!continuemutex.IsInitialized())
{ {
if (continuemutex.Init() < 0) if (continuemutex.Init() < 0) {
printf("STUPID 2\n");
return ERR_JTHREAD_CANTINITMUTEX; return ERR_JTHREAD_CANTINITMUTEX;
}
} }
if (!continuemutex2.IsInitialized()) if (!continuemutex2.IsInitialized())
{ {
if (continuemutex2.Init() < 0) if (continuemutex2.Init() < 0) {
printf("STUPID 3\n");
return ERR_JTHREAD_CANTINITMUTEX; return ERR_JTHREAD_CANTINITMUTEX;
}
} }
mutexinit = true; mutexinit = true;
} }
...@@ -68,6 +77,7 @@ int JThread::Start() ...@@ -68,6 +77,7 @@ int JThread::Start()
if (running) if (running)
{ {
runningmutex.Unlock(); runningmutex.Unlock();
printf("STUPID 4\n");
return ERR_JTHREAD_ALREADYRUNNING; return ERR_JTHREAD_ALREADYRUNNING;
} }
runningmutex.Unlock(); runningmutex.Unlock();
...@@ -77,6 +87,7 @@ int JThread::Start() ...@@ -77,6 +87,7 @@ int JThread::Start()
if (status != 0) if (status != 0)
{ {
continuemutex.Unlock(); continuemutex.Unlock();
printf("STUPID 5 %d (%s) (%s)\n", strerror(errno), strerror(status));
return ERR_JTHREAD_CANTSTARTTHREAD; return ERR_JTHREAD_CANTSTARTTHREAD;
} }
......
...@@ -903,12 +903,17 @@ SWITCH_DECLARE(switch_status) switch_ivr_multi_threaded_bridge(switch_core_sessi ...@@ -903,12 +903,17 @@ SWITCH_DECLARE(switch_status) switch_ivr_multi_threaded_bridge(switch_core_sessi
/* read from the channel while we wait if the audio is up on it */ /* read from the channel while we wait if the audio is up on it */
if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
if (switch_core_session_read_frame(session, &read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { if (switch_core_session_read_frame(session, &read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) {
break; break;
} }
if (switch_core_session_write_frame(session, read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { if (read_frame) {
break; memset(read_frame->data, 0, read_frame->datalen);
if (switch_core_session_write_frame(session, read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) {
break;
}
} }
} else { } else {
switch_yield(1000); switch_yield(1000);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论