Commit 1eef9589 authored by sletz's avatar sletz
Browse files

Raise drivers time out used in synchronous mode.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3596 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 05c58839
......@@ -25,6 +25,10 @@ Paul Davis
Jackdmp changes log
---------------------------
2009-07-11 Stephane Letz <letz@grame.fr>
* Raise drivers time out used in synchronous mode.
2009-07-09 Stephane Letz <letz@grame.fr>
* Use __attribute__((__packed__)) again, more fixes for 64/32 mixed mode.
......
......@@ -269,7 +269,7 @@ void JackAudioDriver::ProcessGraphSync()
fGraphManager->ResumeRefNum(&fClientControl, fSynchroTable);
if (ProcessSlaves() < 0)
jack_error("JackAudioDriver::ProcessSync ProcessSlaves error, engine may now behave abnormally!!");
if (fGraphManager->SuspendRefNum(&fClientControl, fSynchroTable, fEngineControl->fTimeOutUsecs) < 0)
if (fGraphManager->SuspendRefNum(&fClientControl, fSynchroTable, DRIVER_TIMEOUT_FACTOR * fEngineControl->fTimeOutUsecs) < 0)
jack_error("JackAudioDriver::ProcessSync SuspendRefNum error, engine may now behave abnormally!!");
} else { // Graph not finished: do not activate it
jack_error("JackAudioDriver::ProcessSync: error");
......
......@@ -90,6 +90,7 @@
#define SOCKET_TIME_OUT 5 // in sec
#define DRIVER_OPEN_TIMEOUT 5 // in sec
#define FREEWHEEL_DRIVER_TIMEOUT 10 // in sec
#define DRIVER_TIMEOUT_FACTOR 10
#define NO_PORT 0xFFFE
......
......@@ -41,7 +41,7 @@ int JackFreewheelDriver::Process()
} else {
fGraphManager->ResumeRefNum(&fClientControl, fSynchroTable); // Signal all clients
if (fEngineControl->fSyncMode) {
if (fGraphManager->SuspendRefNum(&fClientControl, fSynchroTable, fEngineControl->fTimeOutUsecs) < 0) {
if (fGraphManager->SuspendRefNum(&fClientControl, fSynchroTable, DRIVER_TIMEOUT_FACTOR * fEngineControl->fTimeOutUsecs) < 0) {
jack_error("JackFreewheelDriver::ProcessSync SuspendRefNum error");
return -1;
}
......
......@@ -47,7 +47,7 @@ class SERVER_EXPORT JackMachSemaphore : public detail::JackSynchro
public:
JackMachSemaphore(): fSemaphore(0)
JackMachSemaphore():JackSynchro(), fSemaphore(0)
{}
bool Signal();
......
......@@ -35,7 +35,7 @@ namespace Jack
/* __JackPlatformMutex__ */
#include "JackPosixMutex.h"
namespace Jack {typedef JackPosixMutex JackMutex; }
namespace Jack { typedef JackPosixMutex JackMutex; }
/* __JackPlatformThread__ */
#include "JackMachThread.h"
......@@ -47,8 +47,6 @@ namespace Jack { typedef JackMachSemaphore JackSynchro; }
/* __JackPlatformProcessSync__ */
#include "JackProcessSync.h"
//#include "JackMachProcessSync.h"
//namespace Jack { typedef JackMachProcessSync JackProcessSync; }
/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
/* __JackPlatformServerChannel__ */
......
......@@ -48,7 +48,7 @@ class SERVER_EXPORT JackFifo : public detail::JackSynchro
public:
JackFifo(): fFifo( -1)
JackFifo():JackSynchro(), fFifo(-1)
{}
bool Signal();
......
......@@ -46,7 +46,7 @@ class SERVER_EXPORT JackPosixSemaphore : public detail::JackSynchro
public:
JackPosixSemaphore(): fSemaphore(NULL)
JackPosixSemaphore():JackSynchro(), fSemaphore(NULL)
{}
bool Signal();
......
......@@ -44,7 +44,7 @@ class JackWinSemaphore : public detail::JackSynchro
public:
JackWinSemaphore(): fSemaphore(NULL)
JackWinSemaphore():JackSynchro(), fSemaphore(NULL)
{}
bool Signal();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment