From 3a6d6b32fc62174ab692d1b2d85a5ff9ead791ed Mon Sep 17 00:00:00 2001 From: Stephane Letz Date: Thu, 8 Oct 2015 10:08:19 +0200 Subject: [PATCH] Framework moved in /Library again, using posing semaphores. --- macosx/JackPlatformPlug_os.h | 9 ++++- macosx/Jackdmp.xcodeproj/project.pbxproj | 50 ++++++++++++++++-------- posix/JackPosixSemaphore.cpp | 4 ++ 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/macosx/JackPlatformPlug_os.h b/macosx/JackPlatformPlug_os.h index 059b16e5..6c74cc40 100644 --- a/macosx/JackPlatformPlug_os.h +++ b/macosx/JackPlatformPlug_os.h @@ -60,8 +60,13 @@ namespace Jack { typedef JackMachThread JackThread; } /* __JackPlatformSynchro__ client activation */ #ifndef MY_TARGET_OS_IPHONE -#include "JackMachSemaphore.h" -namespace Jack { typedef JackMachSemaphore JackSynchro; } +//#include "JackMachSemaphore.h" +//namespace Jack { typedef JackMachSemaphore JackSynchro; } + + +#include "JackPosixSemaphore.h" +namespace Jack { typedef JackPosixSemaphore JackSynchro; } + #endif /* __JackPlatformProcessSync__ */ diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 5e95d060..b0c20e37 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -471,6 +471,14 @@ 4B49D44D14865F22003390F8 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B49D44114865F22003390F8 /* session.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B49D44E14865F22003390F8 /* net.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B49D44014865F22003390F8 /* net.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B49D44F14865F22003390F8 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B49D44114865F22003390F8 /* session.h */; }; + 4B4C3B641BC2FF670004CC35 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */; }; + 4B4C3B651BC2FF6A0004CC35 /* JackPosixSemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */; }; + 4B4C3B6A1BC2FFB30004CC35 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */; }; + 4B4C3B6B1BC2FFB50004CC35 /* JackPosixSemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */; }; + 4B4C3B6C1BC2FFC40004CC35 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */; }; + 4B4C3B6D1BC2FFC70004CC35 /* JackPosixSemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */; }; + 4B4C3B6E1BC2FFDD0004CC35 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */; }; + 4B4C3B6F1BC2FFE00004CC35 /* JackPosixSemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */; }; 4B4CA9750E02CF9600F4BFDA /* JackRestartThreadedDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4CA9730E02CF9600F4BFDA /* JackRestartThreadedDriver.h */; }; 4B4CA9760E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B4CA9740E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp */; }; 4B4CA9770E02CF9600F4BFDA /* JackRestartThreadedDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4CA9730E02CF9600F4BFDA /* JackRestartThreadedDriver.h */; }; @@ -3622,6 +3630,7 @@ 4B1499F714BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */, 4BB4215114D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */, 4BB4215314D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */, + 4B4C3B651BC2FF6A0004CC35 /* JackPosixSemaphore.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3709,6 +3718,7 @@ 4B90669B14BEE6D20074CD40 /* JackRequestDecoder.h in Headers */, 4BB4215714D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */, 4BB4215914D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */, + 4B4C3B6D1BC2FFC70004CC35 /* JackPosixSemaphore.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4010,6 +4020,7 @@ 4B1499F914BDA5B300A51A3C /* JackGenericClientChannel.h in Headers */, 4BB4215414D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */, 4BB4215614D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */, + 4B4C3B6B1BC2FFB50004CC35 /* JackPosixSemaphore.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4423,6 +4434,7 @@ 4B90669D14BEE6D20074CD40 /* JackRequestDecoder.h in Headers */, 4BB4215A14D2C0A700A1CAE1 /* JackPosixMutex.h in Headers */, 4BB4215C14D2C0A700A1CAE1 /* JackPosixProcessSync.h in Headers */, + 4B4C3B6F1BC2FFE00004CC35 /* JackPosixSemaphore.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7159,6 +7171,7 @@ 4B327BAB14B4B50400976483 /* JackPosixMutex.cpp in Sources */, 4B1499F614BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */, 4BB4215214D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */, + 4B4C3B641BC2FF670004CC35 /* JackPosixSemaphore.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7231,6 +7244,7 @@ 4B1499F014BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */, 4B90669A14BEE6D20074CD40 /* JackRequestDecoder.cpp in Sources */, 4BB4215814D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */, + 4B4C3B6C1BC2FFC40004CC35 /* JackPosixSemaphore.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7545,6 +7559,7 @@ 4B327BAC14B4B50400976483 /* JackPosixMutex.cpp in Sources */, 4B1499F814BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */, 4BB4215514D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */, + 4B4C3B6A1BC2FFB30004CC35 /* JackPosixSemaphore.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7932,6 +7947,7 @@ 4B1499F214BDA5B300A51A3C /* JackGenericClientChannel.cpp in Sources */, 4B90669C14BEE6D20074CD40 /* JackRequestDecoder.cpp in Sources */, 4BB4215B14D2C0A700A1CAE1 /* JackPosixProcessSync.cpp in Sources */, + 4B4C3B6E1BC2FFDD0004CC35 /* JackPosixSemaphore.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9681,8 +9697,9 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; + MACH_O_TYPE = mh_dylib; OTHER_CFLAGS = ( "-DUSE_POSIX_SHM", "-D__SMP__", @@ -9745,8 +9762,9 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; + MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( "-DUSE_POSIX_SHM", @@ -9864,7 +9882,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( "-DSERVER_SIDE", @@ -9930,7 +9948,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -13559,7 +13577,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( "-DUSE_POSIX_SHM", @@ -13624,7 +13642,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -13680,7 +13698,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "Jack-Info copy 2.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( @@ -14395,7 +14413,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -14458,7 +14476,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -14573,7 +14591,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -14637,7 +14655,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( @@ -16358,7 +16376,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = ( /opt/local/lib, /usr/lib/gcc/darwin/3.3, @@ -16424,7 +16442,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = ( /opt/local/lib, /usr/lib/gcc/darwin/3.3, @@ -16480,7 +16498,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "Jack-Info copy.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( @@ -16878,7 +16896,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( "-DJACK_MONITOR", @@ -16945,7 +16963,7 @@ ../common/jack, ); INFOPLIST_FILE = "Jack-Info.plist"; - INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( diff --git a/posix/JackPosixSemaphore.cpp b/posix/JackPosixSemaphore.cpp index 845e81cc..9af8ccfb 100644 --- a/posix/JackPosixSemaphore.cpp +++ b/posix/JackPosixSemaphore.cpp @@ -32,11 +32,15 @@ void JackPosixSemaphore::BuildName(const char* client_name, const char* server_n { char ext_client_name[SYNC_MAX_NAME_SIZE + 1]; JackTools::RewriteName(client_name, ext_client_name); +#if __APPLE__ // POSIX semaphore names are limited to 32 characters... + snprintf(res, 32, "js_%s", ext_client_name); +#else if (getenv("JACK_PROMISCUOUS_SERVER")) { snprintf(res, size, "jack_sem.%s_%s", server_name, ext_client_name); } else { snprintf(res, size, "jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name); } +#endif } bool JackPosixSemaphore::Signal()