jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Rename JackProcessSync in JackPosixProcessSync. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4739 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
1204ad01f8
commit
c58666dd8c
8 changed files with 93 additions and 76 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -0
      ChangeLog
  2. +3
    -3
      common/wscript
  3. +2
    -2
      linux/JackPlatformPlug_os.h
  4. +2
    -2
      macosx/JackPlatformPlug_os.h
  5. +42
    -28
      macosx/Jackdmp.xcodeproj/project.pbxproj
  6. +32
    -32
      posix/JackPosixProcessSync.cpp
  7. +6
    -7
      posix/JackPosixProcessSync.h
  8. +2
    -2
      solaris/JackPlatformPlug_os.h

+ 4
- 0
ChangeLog View File

@@ -36,6 +36,10 @@ John Emmas
Jackdmp changes log
---------------------------

2012-01-27 Stephane Letz <letz@grame.fr>

* Rename JackProcessSync in JackPosixProcessSync.

2012-01-26 Stephane Letz <letz@grame.fr>

* Add EndTime function (especially for Windows).


+ 3
- 3
common/wscript View File

@@ -74,7 +74,7 @@ def build(bld):
common_libsources += [
'../posix/JackPosixThread.cpp',
'../posix/JackPosixSemaphore.cpp',
'../posix/JackProcessSync.cpp',
'../posix/JackPosixProcessSync.cpp',
'../posix/JackPosixMutex.cpp',
'../posix/JackSocket.cpp',
'../linux/JackLinuxTime.c',
@@ -87,7 +87,7 @@ def build(bld):
common_libsources += [
'../posix/JackPosixThread.cpp',
'../posix/JackFifo.cpp',
'../posix/JackProcessSync.cpp',
'../posix/JackPosixProcessSync.cpp',
'../posix/JackPosixMutex.cpp',
'../posix/JackSocket.cpp',
'../solaris/JackSolarisTime.c',
@@ -97,7 +97,7 @@ def build(bld):

if bld.env['IS_MACOSX']:
common_libsources += [
'../posix/JackProcessSync.cpp',
'../posix/JackPosixProcessSync.cpp',
'../posix/JackPosixThread.cpp',
'../macosx/JackMachThread.cpp',
'../macosx/JackMachSemaphore.cpp',


+ 2
- 2
linux/JackPlatformPlug_os.h View File

@@ -63,9 +63,9 @@ namespace Jack { typedef JackPosixSemaphore JackSynchro; }
namespace Jack { typedef JackClientSocket JackChannelTransaction; }
*/

#include "JackProcessSync.h"
/* __JackPlatformProcessSync__ */
/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
#include "JackPosixProcessSync.h"
namespace Jack { typedef JackPosixProcessSync JackProcessSync; }

/* __JackPlatformServerChannel__ */
#include "JackSocketServerChannel.h"


+ 2
- 2
macosx/JackPlatformPlug_os.h View File

@@ -65,8 +65,8 @@ namespace Jack { typedef JackMachSemaphore JackSynchro; }
#endif

/* __JackPlatformProcessSync__ */
#include "JackProcessSync.h"
/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
#include "JackPosixProcessSync.h"
namespace Jack { typedef JackPosixProcessSync JackProcessSync; }

#ifndef MY_TARGET_OS_IPHONE
/* __JackPlatformServerChannel__ */


+ 42
- 28
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -427,7 +427,6 @@
4B47ACA810B5890100469C67 /* jslist.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B9A26000DBF8584006E9FBC /* jslist.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B47ACA910B5890100469C67 /* JackMessageBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4F9C8B0DC20C0400706CB0 /* JackMessageBuffer.h */; };
4B47ACAA10B5890100469C67 /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */; };
4B47ACAB10B5890100469C67 /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4B47ACB110B5890100469C67 /* JackShmMem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */; };
4B47ACB210B5890100469C67 /* shm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1900834EE8400C94B91 /* shm.c */; };
4B47ACB310B5890100469C67 /* JackActivationCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */; };
@@ -457,7 +456,6 @@
4B47ACCC10B5890100469C67 /* JackPosixServerLaunch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBBA0E878B9C003D2374 /* JackPosixServerLaunch.cpp */; };
4B47ACCD10B5890100469C67 /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
4B47ACCE10B5890100469C67 /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
4B47ACCF10B5890100469C67 /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4B47ACD210B5890100469C67 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
4B49D44214865F22003390F8 /* net.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B49D44014865F22003390F8 /* net.h */; };
4B49D44314865F22003390F8 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B49D44114865F22003390F8 /* session.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -822,7 +820,6 @@
4BA3396910B2E36800190E3B /* JackControlAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4E9AF90E5F1090000A3278 /* JackControlAPI.h */; };
4BA3396A10B2E36800190E3B /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */; };
4BA3396B10B2E36800190E3B /* JackEngineProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BBAE40E0F42FA6100B8BD3F /* JackEngineProfiling.h */; };
4BA3396C10B2E36800190E3B /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4BA3396D10B2E36800190E3B /* JackMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339200F8B873E0080FB5B /* JackMidiDriver.h */; };
4BA3396E10B2E36800190E3B /* JackWaitThreadedDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BBC93B90DF9736C002DF220 /* JackWaitThreadedDriver.h */; };
4BA3396F10B2E36800190E3B /* JackArgParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */; };
@@ -867,7 +864,6 @@
4BA3399E10B2E36800190E3B /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
4BA3399F10B2E36800190E3B /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
4BA339A010B2E36800190E3B /* JackEngineProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBAE40F0F42FA6100B8BD3F /* JackEngineProfiling.cpp */; };
4BA339A110B2E36800190E3B /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4BA339A210B2E36800190E3B /* JackMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */; };
4BA339A310B2E36800190E3B /* JackWaitThreadedDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC93B80DF9736C002DF220 /* JackWaitThreadedDriver.cpp */; };
4BA339A410B2E36800190E3B /* JackArgParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */; };
@@ -888,6 +884,24 @@
4BAB95BB0B9E20B800A0C723 /* JackPortType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAB95B70B9E20B800A0C723 /* JackPortType.h */; };
4BAB95ED0B9E21A500A0C723 /* JackAudioPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95EC0B9E21A500A0C723 /* JackAudioPort.cpp */; };
4BAB95EE0B9E21A500A0C723 /* JackAudioPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95EC0B9E21A500A0C723 /* JackAudioPort.cpp */; };
4BB4214B14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4214C14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4214D14D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB4214E14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4214F14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4215014D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB4215114D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4215214D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4215314D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB4215414D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4215514D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4215614D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB4215714D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4215814D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4215914D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB4215A14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
4BB4215B14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */; };
4BB4215C14D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */; };
4BB9D4B30E2610B300351653 /* JackTransportEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD4B4D409BACD9600750C0F /* JackTransportEngine.h */; };
4BB9D4B40E2610B400351653 /* JackTransportEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4B4D509BACD9600750C0F /* JackTransportEngine.cpp */; };
4BB9D4E40E26112900351653 /* JackEngineControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6F7AEC0CD0CDBD00F48A9D /* JackEngineControl.cpp */; };
@@ -967,14 +981,6 @@
4BE5FED10E725C320020B576 /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5FECF0E725C320020B576 /* JackCoreAudioAdapter.cpp */; };
4BE5FED20E725C320020B576 /* JackCoreAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FED00E725C320020B576 /* JackCoreAudioAdapter.h */; };
4BE6C6AD0A3E0A65005A203A /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6C6AC0A3E0A65005A203A /* test.cpp */; };
4BECB2F50F4451C10091B70A /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4BECB2F60F4451C10091B70A /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4BECB2F70F4451C10091B70A /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4BECB2F80F4451C10091B70A /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4BECB2F90F4451C10091B70A /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4BECB2FA0F4451C10091B70A /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4BECB2FB0F4451C10091B70A /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */; };
4BECB2FC0F4451C10091B70A /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BECB2F40F4451C10091B70A /* JackProcessSync.h */; };
4BF2841A0F31B4BC00B05BE3 /* JackArgParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */; };
4BF2841B0F31B4BC00B05BE3 /* JackArgParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */; };
4BF3391A0F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */; };
@@ -1888,6 +1894,9 @@
4BAB95B70B9E20B800A0C723 /* JackPortType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortType.h; path = ../common/JackPortType.h; sourceTree = SOURCE_ROOT; };
4BAB95EC0B9E21A500A0C723 /* JackAudioPort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioPort.cpp; path = ../common/JackAudioPort.cpp; sourceTree = SOURCE_ROOT; };
4BB371D40C1AD85A0050C1E4 /* JackNotification.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackNotification.h; path = ../common/JackNotification.h; sourceTree = SOURCE_ROOT; };
4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPosixMutex.h; path = ../posix/JackPosixMutex.h; sourceTree = SOURCE_ROOT; };
4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackPosixProcessSync.cpp; path = ../posix/JackPosixProcessSync.cpp; sourceTree = SOURCE_ROOT; };
4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPosixProcessSync.h; path = ../posix/JackPosixProcessSync.h; sourceTree = SOURCE_ROOT; };
4BBAE40E0F42FA6100B8BD3F /* JackEngineProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackEngineProfiling.h; path = ../common/JackEngineProfiling.h; sourceTree = SOURCE_ROOT; };
4BBAE40F0F42FA6100B8BD3F /* JackEngineProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackEngineProfiling.cpp; path = ../common/JackEngineProfiling.cpp; sourceTree = SOURCE_ROOT; };
4BBB00CF0E72614F0018AB1B /* JackPortAudioDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortAudioDevices.cpp; path = ../windows/portaudio/JackPortAudioDevices.cpp; sourceTree = SOURCE_ROOT; };
@@ -1938,8 +1947,6 @@
4BE6C6A30A3E096F005A203A /* jack_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_test; sourceTree = BUILT_PRODUCTS_DIR; };
4BE6C6AC0A3E0A65005A203A /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../tests/test.cpp; sourceTree = SOURCE_ROOT; };
4BE99D300AD7A04800C59091 /* jack_cpu */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_cpu; sourceTree = BUILT_PRODUCTS_DIR; };
4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackProcessSync.cpp; path = ../posix/JackProcessSync.cpp; sourceTree = SOURCE_ROOT; };
4BECB2F40F4451C10091B70A /* JackProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackProcessSync.h; path = ../posix/JackProcessSync.h; sourceTree = SOURCE_ROOT; };
4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackArgParser.cpp; path = ../common/JackArgParser.cpp; sourceTree = SOURCE_ROOT; };
4BF284170F31B4BC00B05BE3 /* JackArgParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackArgParser.h; path = ../common/JackArgParser.h; sourceTree = SOURCE_ROOT; };
4BF3390C0F8B864B0080FB5B /* jack_coremidi.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_coremidi.so; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3205,9 +3212,10 @@
4BA3874007947A46008D8992 /* Synchro */ = {
isa = PBXGroup;
children = (
4BB4214914D2C0A700A1CAE1 /* JackPosixProcessSync.cpp */,
4BB4214A14D2C0A700A1CAE1 /* JackPosixProcessSync.h */,
4B327BA614B4B50400976483 /* JackPosixMutex.cpp */,
4BECB2F30F4451C10091B70A /* JackProcessSync.cpp */,
4BECB2F40F4451C10091B70A /* JackProcessSync.h */,
4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */,
4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */,
4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */,
4BD561C708EEB910006BBC2A /* JackSynchro.h */,
@@ -3599,7 +3607,6 @@
4B9A26050DBF8584006E9FBC /* jslist.h in Headers */,
4B4F9C910DC20C0400706CB0 /* JackMessageBuffer.h in Headers */,
4B93F19E0E87998400E4ECCD /* JackPosixThread.h in Headers */,
4BECB2FA0F4451C10091B70A /* JackProcessSync.h in Headers */,
4B88D03F11298BEE007A87C1 /* weakjack.h in Headers */,
4B88D04011298BEE007A87C1 /* weakmacros.h in Headers */,
4B8A38F0117B827900664E07 /* JackSocket.h in Headers */,
@@ -3609,6 +3616,8 @@
4B49D44614865F22003390F8 /* net.h in Headers */,
4B49D44714865F22003390F8 /* session.h in Headers */,
4B1499F714BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4BB4215114D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4215314D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3667,7 +3676,6 @@
4B4E9AFD0E5F1090000A3278 /* JackControlAPI.h in Headers */,
4B93F19A0E87992200E4ECCD /* JackPosixThread.h in Headers */,
4BBAE4120F42FA6100B8BD3F /* JackEngineProfiling.h in Headers */,
4BECB2FC0F4451C10091B70A /* JackProcessSync.h in Headers */,
4BF339220F8B873E0080FB5B /* JackMidiDriver.h in Headers */,
4BDCDBD21001FD0200B15929 /* JackWaitThreadedDriver.h in Headers */,
4BDCDC0A1001FDA800B15929 /* JackArgParser.h in Headers */,
@@ -3695,6 +3703,8 @@
4B49D44B14865F22003390F8 /* session.h in Headers */,
4B1499F114BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4B90669B14BEE6D20074CD40 /* JackRequestDecoder.h in Headers */,
4BB4215714D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4215914D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3986,7 +3996,6 @@
4B47ACA810B5890100469C67 /* jslist.h in Headers */,
4B47ACA910B5890100469C67 /* JackMessageBuffer.h in Headers */,
4B47ACAA10B5890100469C67 /* JackPosixThread.h in Headers */,
4B47ACAB10B5890100469C67 /* JackProcessSync.h in Headers */,
4B88D04111298BEE007A87C1 /* weakjack.h in Headers */,
4B88D04211298BEE007A87C1 /* weakmacros.h in Headers */,
4B5160A913215EBF00BB7DCB /* systemdeps.h in Headers */,
@@ -3994,6 +4003,8 @@
4B49D44814865F22003390F8 /* net.h in Headers */,
4B49D44914865F22003390F8 /* session.h in Headers */,
4B1499F914BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4BB4215414D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4215614D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4079,7 +4090,6 @@
4B4F9C8F0DC20C0400706CB0 /* JackMessageBuffer.h in Headers */,
4BB9D4B30E2610B300351653 /* JackTransportEngine.h in Headers */,
4BC3B6A50E703B2E0066E42F /* JackPosixThread.h in Headers */,
4BECB2F80F4451C10091B70A /* JackProcessSync.h in Headers */,
4B94334A10A5E666002A187F /* systemdeps.h in Headers */,
4B88D03B11298BEE007A87C1 /* weakjack.h in Headers */,
4B88D03C11298BEE007A87C1 /* weakmacros.h in Headers */,
@@ -4089,6 +4099,8 @@
4B49D44414865F22003390F8 /* net.h in Headers */,
4B49D44514865F22003390F8 /* session.h in Headers */,
4B1499F514BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4BB4214B14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4214D14D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4152,7 +4164,6 @@
4BC3B6A70E703B2E0066E42F /* JackPosixThread.h in Headers */,
4BF2841B0F31B4BC00B05BE3 /* JackArgParser.h in Headers */,
4BBAE4100F42FA6100B8BD3F /* JackEngineProfiling.h in Headers */,
4BECB2F60F4451C10091B70A /* JackProcessSync.h in Headers */,
4BF339240F8B873E0080FB5B /* JackMidiDriver.h in Headers */,
4B94334B10A5E666002A187F /* systemdeps.h in Headers */,
4B88D03D11298BEE007A87C1 /* weakjack.h in Headers */,
@@ -4178,6 +4189,8 @@
4B49D44314865F22003390F8 /* session.h in Headers */,
4B1499FB14BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4B90669F14BEE6D20074CD40 /* JackRequestDecoder.h in Headers */,
4BB4214E14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4215014D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4374,7 +4387,6 @@
4BA3396910B2E36800190E3B /* JackControlAPI.h in Headers */,
4BA3396A10B2E36800190E3B /* JackPosixThread.h in Headers */,
4BA3396B10B2E36800190E3B /* JackEngineProfiling.h in Headers */,
4BA3396C10B2E36800190E3B /* JackProcessSync.h in Headers */,
4BA3396D10B2E36800190E3B /* JackMidiDriver.h in Headers */,
4BA3396E10B2E36800190E3B /* JackWaitThreadedDriver.h in Headers */,
4BA3396F10B2E36800190E3B /* JackArgParser.h in Headers */,
@@ -4402,6 +4414,8 @@
4B49D44D14865F22003390F8 /* session.h in Headers */,
4B1499F314BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */,
4B90669D14BEE6D20074CD40 /* JackRequestDecoder.h in Headers */,
4BB4215A14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */,
4BB4215C14D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7133,11 +7147,11 @@
4B93F19C0E87998200E4ECCD /* JackPosixServerLaunch.cpp in Sources */,
4B93F19D0E87998400E4ECCD /* JackPosixThread.cpp in Sources */,
4B93F1C00E87A35400E4ECCD /* JackMachTime.c in Sources */,
4BECB2F90F4451C10091B70A /* JackProcessSync.cpp in Sources */,
4B8A38F1117B827E00664E07 /* JackSocketClientChannel.cpp in Sources */,
4B8A38F6117B82AB00664E07 /* JackSocket.cpp in Sources */,
4B327BAB14B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499F614BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4BB4215214D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7186,7 +7200,6 @@
4B93F1990E87992100E4ECCD /* JackPosixThread.cpp in Sources */,
4B93F22B0E87A72500E4ECCD /* JackMachTime.c in Sources */,
4BBAE4130F42FA6100B8BD3F /* JackEngineProfiling.cpp in Sources */,
4BECB2FB0F4451C10091B70A /* JackProcessSync.cpp in Sources */,
4BF339210F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */,
4BDCDBD11001FD0100B15929 /* JackWaitThreadedDriver.cpp in Sources */,
4BDCDC091001FDA800B15929 /* JackArgParser.cpp in Sources */,
@@ -7210,6 +7223,7 @@
4B327BA814B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499F014BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4B90669A14BEE6D20074CD40 /* JackRequestDecoder.cpp in Sources */,
4BB4215814D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7520,9 +7534,9 @@
4B47ACCC10B5890100469C67 /* JackPosixServerLaunch.cpp in Sources */,
4B47ACCD10B5890100469C67 /* JackPosixThread.cpp in Sources */,
4B47ACCE10B5890100469C67 /* JackMachTime.c in Sources */,
4B47ACCF10B5890100469C67 /* JackProcessSync.cpp in Sources */,
4B327BAC14B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499F814BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4BB4215514D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7603,11 +7617,11 @@
4BC3B6A40E703B2E0066E42F /* JackPosixThread.cpp in Sources */,
4BF5FBBC0E878B9C003D2374 /* JackPosixServerLaunch.cpp in Sources */,
4BF5FBCB0E878D24003D2374 /* JackMachTime.c in Sources */,
4BECB2F70F4451C10091B70A /* JackProcessSync.cpp in Sources */,
4B2209EC12F6BC2100E5DC26 /* JackSocket.cpp in Sources */,
4B2209EE12F6BC2300E5DC26 /* JackSocketClientChannel.cpp in Sources */,
4B327BAA14B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499F414BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4BB4214C14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7658,7 +7672,6 @@
4BF5FBCA0E878D24003D2374 /* JackMachTime.c in Sources */,
4BF2841A0F31B4BC00B05BE3 /* JackArgParser.cpp in Sources */,
4BBAE4110F42FA6100B8BD3F /* JackEngineProfiling.cpp in Sources */,
4BECB2F50F4451C10091B70A /* JackProcessSync.cpp in Sources */,
4BF339230F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */,
4BC2CA55113C6C930076717C /* JackNetInterface.cpp in Sources */,
4BC2CA57113C6C9B0076717C /* JackNetUnixSocket.cpp in Sources */,
@@ -7680,6 +7693,7 @@
4B327BA714B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499FA14BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4B90669E14BEE6D20074CD40 /* JackRequestDecoder.cpp in Sources */,
4BB4214F14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7884,7 +7898,6 @@
4BA3399E10B2E36800190E3B /* JackPosixThread.cpp in Sources */,
4BA3399F10B2E36800190E3B /* JackMachTime.c in Sources */,
4BA339A010B2E36800190E3B /* JackEngineProfiling.cpp in Sources */,
4BA339A110B2E36800190E3B /* JackProcessSync.cpp in Sources */,
4BA339A210B2E36800190E3B /* JackMidiDriver.cpp in Sources */,
4BA339A310B2E36800190E3B /* JackWaitThreadedDriver.cpp in Sources */,
4BA339A410B2E36800190E3B /* JackArgParser.cpp in Sources */,
@@ -7908,6 +7921,7 @@
4B327BA914B4B50400976483 /* JackPosixMutex.cpp in Sources */,
4B1499F214BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */,
4B90669C14BEE6D20074CD40 /* JackRequestDecoder.cpp in Sources */,
4BB4215B14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};


posix/JackProcessSync.cpp → posix/JackPosixProcessSync.cpp View File

@@ -1,4 +1,4 @@
/*
/*
Copyright (C) 2004-2008 Grame

This program is free software; you can redistribute it and/or modify
@@ -17,84 +17,84 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#include "JackProcessSync.h"
#include "JackPosixProcessSync.h"
#include "JackError.h"

namespace Jack
{

void JackProcessSync::Signal()
void JackPosixProcessSync::Signal()
{
int res = pthread_cond_signal(&fCond);
if (res != 0)
jack_error("JackProcessSync::Signal error err = %s", strerror(res));
jack_error("JackPosixProcessSync::Signal error err = %s", strerror(res));
}

// TO DO : check thread consistency?
void JackProcessSync::LockedSignal()
void JackPosixProcessSync::LockedSignal()
{
int res = pthread_mutex_lock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedSignal error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignal error err = %s", strerror(res));
res = pthread_cond_signal(&fCond);
if (res != 0)
jack_error("JackProcessSync::LockedSignal error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignal error err = %s", strerror(res));
res = pthread_mutex_unlock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedSignal error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignal error err = %s", strerror(res));
}

void JackProcessSync::SignalAll()
void JackPosixProcessSync::SignalAll()
{
int res = pthread_cond_broadcast(&fCond);
if (res != 0)
jack_error("JackProcessSync::SignalAll error err = %s", strerror(res));
jack_error("JackPosixProcessSync::SignalAll error err = %s", strerror(res));
}

// TO DO : check thread consistency?
void JackProcessSync::LockedSignalAll()
void JackPosixProcessSync::LockedSignalAll()
{
int res = pthread_mutex_lock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedSignalAll error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignalAll error err = %s", strerror(res));
res = pthread_cond_broadcast(&fCond);
if (res != 0)
jack_error("JackProcessSync::LockedSignalAll error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignalAll error err = %s", strerror(res));
res = pthread_mutex_unlock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedSignalAll error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedSignalAll error err = %s", strerror(res));
}

void JackProcessSync::Wait()
void JackPosixProcessSync::Wait()
{
ThrowIf(!pthread_equal(pthread_self(), fOwner), JackException("JackProcessSync::Wait: a thread has to have locked a mutex before it can wait"));
ThrowIf(!pthread_equal(pthread_self(), fOwner), JackException("JackPosixProcessSync::Wait: a thread has to have locked a mutex before it can wait"));
fOwner = 0;

int res = pthread_cond_wait(&fCond, &fMutex);
if (res != 0) {
jack_error("JackProcessSync::Wait error err = %s", strerror(res));
jack_error("JackPosixProcessSync::Wait error err = %s", strerror(res));
} else {
fOwner = pthread_self();
}
}

// TO DO : check thread consistency?
void JackProcessSync::LockedWait()
void JackPosixProcessSync::LockedWait()
{
int res;
res = pthread_mutex_lock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedWait error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedWait error err = %s", strerror(res));
if ((res = pthread_cond_wait(&fCond, &fMutex)) != 0)
jack_error("JackProcessSync::LockedWait error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedWait error err = %s", strerror(res));
res = pthread_mutex_unlock(&fMutex);
if (res != 0)
jack_error("JackProcessSync::LockedWait error err = %s", strerror(res));
jack_error("JackPosixProcessSync::LockedWait error err = %s", strerror(res));
}

bool JackProcessSync::TimedWait(long usec)
bool JackPosixProcessSync::TimedWait(long usec)
{
ThrowIf(!pthread_equal(pthread_self(), fOwner), JackException("JackProcessSync::TimedWait: a thread has to have locked a mutex before it can wait"));
ThrowIf(!pthread_equal(pthread_self(), fOwner), JackException("JackPosixProcessSync::TimedWait: a thread has to have locked a mutex before it can wait"));
fOwner = 0;

struct timeval T0, T1;
@@ -102,7 +102,7 @@ bool JackProcessSync::TimedWait(long usec)
struct timeval now;
int res;

jack_log("JackProcessSync::TimedWait time out = %ld", usec);
jack_log("JackPosixProcessSync::TimedWait time out = %ld", usec);
gettimeofday(&T0, 0);

gettimeofday(&now, 0);
@@ -112,20 +112,20 @@ bool JackProcessSync::TimedWait(long usec)

res = pthread_cond_timedwait(&fCond, &fMutex, &time);
if (res != 0) {
jack_error("JackProcessSync::TimedWait error usec = %ld err = %s", usec, strerror(res));
jack_error("JackPosixProcessSync::TimedWait error usec = %ld err = %s", usec, strerror(res));
} else {
fOwner = pthread_self();
}

gettimeofday(&T1, 0);
jack_log("JackProcessSync::TimedWait finished delta = %5.1lf",
jack_log("JackPosixProcessSync::TimedWait finished delta = %5.1lf",
(1e6 * T1.tv_sec - 1e6 * T0.tv_sec + T1.tv_usec - T0.tv_usec));

return (res == 0);
}

// TO DO : check thread consistency?
bool JackProcessSync::LockedTimedWait(long usec)
bool JackPosixProcessSync::LockedTimedWait(long usec)
{
struct timeval T0, T1;
timespec time;
@@ -134,9 +134,9 @@ bool JackProcessSync::LockedTimedWait(long usec)

res1 = pthread_mutex_lock(&fMutex);
if (res1 != 0)
jack_error("JackProcessSync::LockedTimedWait error err = %s", usec, strerror(res1));
jack_error("JackPosixProcessSync::LockedTimedWait error err = %s", usec, strerror(res1));

jack_log("JackProcessSync::TimedWait time out = %ld", usec);
jack_log("JackPosixProcessSync::TimedWait time out = %ld", usec);
gettimeofday(&T0, 0);

gettimeofday(&now, 0);
@@ -145,14 +145,14 @@ bool JackProcessSync::LockedTimedWait(long usec)
time.tv_nsec = (next_date_usec % 1000000) * 1000;
res2 = pthread_cond_timedwait(&fCond, &fMutex, &time);
if (res2 != 0)
jack_error("JackProcessSync::LockedTimedWait error usec = %ld err = %s", usec, strerror(res2));
jack_error("JackPosixProcessSync::LockedTimedWait error usec = %ld err = %s", usec, strerror(res2));

gettimeofday(&T1, 0);
res1 = pthread_mutex_unlock(&fMutex);
if (res1 != 0)
jack_error("JackProcessSync::LockedTimedWait error err = %s", usec, strerror(res1));
jack_error("JackPosixProcessSync::LockedTimedWait error err = %s", usec, strerror(res1));

jack_log("JackProcessSync::TimedWait finished delta = %5.1lf",
jack_log("JackPosixProcessSync::TimedWait finished delta = %5.1lf",
(1e6 * T1.tv_sec - 1e6 * T0.tv_sec + T1.tv_usec - T0.tv_usec));

return (res2 == 0);

posix/JackProcessSync.h → posix/JackPosixProcessSync.h View File

@@ -17,10 +17,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#ifndef __JackProcessSync__
#define __JackProcessSync__
#ifndef __JackPosixProcessSync__
#define __JackPosixProcessSync__

#include "JackPlatformPlug.h"
#include "JackPosixMutex.h"
#include "JackException.h"
#include <sys/time.h>
@@ -30,10 +29,10 @@ namespace Jack
{

/*!
\brief A synchronization primitive built using a condition variable.
\brief A synchronization primitive built using a condition variable.
*/

class JackProcessSync : public JackBasePosixMutex
class JackPosixProcessSync : public JackBasePosixMutex
{

private:
@@ -42,13 +41,13 @@ class JackProcessSync : public JackBasePosixMutex

public:

JackProcessSync():JackBasePosixMutex()
JackPosixProcessSync():JackBasePosixMutex()
{
int res = pthread_cond_init(&fCond, NULL);
ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the cond variable"));
}

virtual ~JackProcessSync()
virtual ~JackPosixProcessSync()
{
pthread_cond_destroy(&fCond);
}

+ 2
- 2
solaris/JackPlatformPlug_os.h View File

@@ -57,9 +57,9 @@ namespace Jack { typedef JackFifo JackSynchro; }
#include "JackSocket.h"
namespace Jack { typedef JackClientSocket JackChannelTransaction; }

#include "JackProcessSync.h"
/* __JackPlatformProcessSync__ */
/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
#include "JackPosixProcessSync.h"
namespace Jack { typedef JackPosixProcessSync JackProcessSync; }

/* __JackPlatformServerChannel__ */
#include "JackSocketServerChannel.h"


Write Preview
Loading…
Cancel
Save