test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-29 18:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build for macos

Browse Source
This commit is contained in:
zsx 2018-12-07 13:50:42 +08:00
parent ca7d64f263
commit d0d51ec6d1
24 changed files with 415 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
acl.xcworkspace/xcshareddata/acl.xccheckout Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>889A84D5-5ED5-44CE-AAB8-0453F04089EE</string>
<key>IDESourceControlProjectName</key>
<string>acl</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>88096D4D131EB462BECDB895E03F8CE7B9E4FD3E</key>
<string>https://github.com/zhengshuxin/acl</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>acl.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>88096D4D131EB462BECDB895E03F8CE7B9E4FD3E</key>
<string>..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/zhengshuxin/acl</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>88096D4D131EB462BECDB895E03F8CE7B9E4FD3E</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>88096D4D131EB462BECDB895E03F8CE7B9E4FD3E</string>
<key>IDESourceControlWCCName</key>
<string>acl</string>
</dict>
</array>
</dict>
</plist>

BIN
acl.xcworkspace/xcuserdata/zsx.xcuserdatad/UserInterfaceState.xcuserstate generated Normal file
View File

Binary file not shown.

BIN
app/master/daemon/acl_master Executable file
View File

Binary file not shown.

BIN
app/master/tools/master_ctl/master_ctl Executable file
View File

Binary file not shown.

BIN
app/master/tools/master_ctld/master_ctld Executable file
View File

Binary file not shown.

BIN
app/master/tools/master_guard/master_guard Executable file
View File

Binary file not shown.

BIN
app/master/tools/master_monitor/master_monitor Executable file
View File

Binary file not shown.

77
lib_acl/acl.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/acl.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0779D32D1DBE054C00449438"
BuildableName = "libacl.a"
BlueprintName = "acl"
ReferencedContainer = "container:acl.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0779D32D1DBE054C00449438"
BuildableName = "libacl.a"
BlueprintName = "acl"
ReferencedContainer = "container:acl.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0779D32D1DBE054C00449438"
BuildableName = "libacl.a"
BlueprintName = "acl"
ReferencedContainer = "container:acl.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
lib_acl/acl.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/xcschememanagement.plist Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>acl.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>0779D32D1DBE054C00449438</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

2
lib_acl/src/stdlib/sys/acl_sys_socket.c
View File

@ -433,7 +433,7 @@ int acl_socket_alive(ACL_SOCKET fd)
return 0;
if (ret == 0)
return 1;
ret = __sys_recv(fd, buf, sizeof(buf), MSG_PEEK);
ret = (int) __sys_recv(fd, buf, sizeof(buf), MSG_PEEK);
if (ret == 0 || (ret < 0 && acl_last_error() != ACL_EWOULDBLOCK))
return 0;
return 1;

77
lib_acl_cpp/acl_cpp.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/acl_cpp.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A458301E6FCCB4002C9B3C"
BuildableName = "libacl_cpp.a"
BlueprintName = "acl_cpp"
ReferencedContainer = "container:acl_cpp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A458301E6FCCB4002C9B3C"
BuildableName = "libacl_cpp.a"
BlueprintName = "acl_cpp"
ReferencedContainer = "container:acl_cpp.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A458301E6FCCB4002C9B3C"
BuildableName = "libacl_cpp.a"
BlueprintName = "acl_cpp"
ReferencedContainer = "container:acl_cpp.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
lib_acl_cpp/acl_cpp.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/xcschememanagement.plist Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>acl_cpp.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>07A458301E6FCCB4002C9B3C</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

4
lib_fiber/c/include/fiber/fiber_hook.h
View File

@ -47,11 +47,11 @@ FIBER_API ssize_t acl_fiber_writev(socket_t, const struct iovec* iov, int iovcnt
FIBER_API ssize_t acl_fiber_sendmsg(socket_t, const struct msghdr* msg, int flags);
FIBER_API ssize_t acl_fiber_recv(socket_t, void* buf, size_t len, int flags);
FIBER_API ssize_t acl_fiber_recvfrom(socket_t, void* buf, int len, int flags,
FIBER_API ssize_t acl_fiber_recvfrom(socket_t, void* buf, size_t len, int flags,
struct sockaddr* src_addr, socklen_t* addrlen);
FIBER_API ssize_t acl_fiber_send(socket_t, const void* buf, size_t len, int flags);
FIBER_API ssize_t acl_fiber_sendto(socket_t, const void* buf, int len, int flags,
FIBER_API ssize_t acl_fiber_sendto(socket_t, const void* buf, size_t len, int flags,
const struct sockaddr* dest_addr, socklen_t addrlen);
FIBER_API int acl_fiber_select(int nfds, fd_set *readfds, fd_set *writefds,

18
lib_fiber/c/src/fbase_event.c
View File

@ -60,7 +60,8 @@ void fbase_event_close(FIBER_BASE *fbase)
int fbase_event_wait(FIBER_BASE *fbase)
{
long long n;
int ret, interrupt = 0;
ssize_t ret;
int interrupt = 0;
if (fbase->event_in < 0) {
msg_fatal("%s(%d), %s: invalid event_in=%d",
@ -74,21 +75,21 @@ int fbase_event_wait(FIBER_BASE *fbase)
}
if (ret >= 0) {
msg_fatal("%s(%d), %s: read ret=%d invalid length, "
msg_fatal("%s(%d), %s: read ret=%ld invalid length, "
"interrupt=%d", __FILE__, __LINE__,
__FUNCTION__, ret, interrupt);
}
if (acl_fiber_last_error() == EINTR) {
interrupt++;
msg_info("%s(%d), %s: read EINTR=%d, in=%d, ret=%d",
msg_info("%s(%d), %s: read EINTR=%d, in=%d, ret=%ld",
__FILE__, __LINE__, __FUNCTION__,
interrupt, fbase->event_in, ret);
doze(1);
continue;
}
msg_error("%s(%d), %s: read error %s, in=%d, ret=%d, "
msg_error("%s(%d), %s: read error %s, in=%d, ret=%ld, "
"interrupt=%d", __FILE__, __LINE__, __FUNCTION__,
last_serror(), fbase->event_in, ret, interrupt);
return -1;
@ -106,7 +107,8 @@ int fbase_event_wait(FIBER_BASE *fbase)
int fbase_event_wakeup(FIBER_BASE *fbase)
{
long long n = 1;
int ret, interrupt = 0;
ssize_t ret;
int interrupt = 0;
/**
* if (LIKELY(atomic_int64_cas(fbase->atomic, 0, 1) != 0)) {
@ -126,21 +128,21 @@ int fbase_event_wakeup(FIBER_BASE *fbase)
}
if (ret >= 0) {
msg_fatal("%s(%d), %s: write ret=%d invalid length, "
msg_fatal("%s(%d), %s: write ret=%ld invalid length, "
"interrupt=%d", __FILE__, __LINE__,
__FUNCTION__, ret, interrupt);
}
if (acl_fiber_last_error() == EINTR) {
interrupt++;
msg_info("%s(%d), %s: write EINTR=%d, out=%d, ret=%d",
msg_info("%s(%d), %s: write EINTR=%d, out=%d, ret=%ld",
__FILE__, __LINE__, __FUNCTION__,
interrupt, fbase->event_out, ret);
doze(1);
continue;
}
msg_error("%s(%d), %s: write error %s, out=%d, ret=%d, "
msg_error("%s(%d), %s: write error %s, out=%d, ret=%ld, "
"interrupt=%d", __FILE__, __LINE__, __FUNCTION__,
last_serror(), fbase->event_out, ret, interrupt);
return -1;

16
lib_fiber/c/src/hook/io.c
View File

@ -353,7 +353,7 @@ ssize_t acl_fiber_recv(socket_t sockfd, void *buf, size_t len, int flags)
fiber_wait_read(fe);
}
ret = __sys_recv(sockfd, buf, len, flags);
ret = (int) __sys_recv(sockfd, buf, len, flags);
if (ret >= 0) {
return ret;
}
@ -378,7 +378,7 @@ ssize_t acl_fiber_recv(socket_t sockfd, void *buf, size_t len, int flags)
int WINAPI acl_fiber_recvfrom(socket_t sockfd, char *buf, int len,
int flags, struct sockaddr *src_addr, socklen_t *addrlen)
#else
ssize_t acl_fiber_recvfrom(socket_t sockfd, void *buf, int len,
ssize_t acl_fiber_recvfrom(socket_t sockfd, void *buf, size_t len,
int flags, struct sockaddr *src_addr, socklen_t *addrlen)
#endif
{
@ -401,11 +401,11 @@ ssize_t acl_fiber_recvfrom(socket_t sockfd, void *buf, int len,
fe = fiber_file_open(sockfd);
if (EVENT_IS_IOCP(fiber_io_event())) {
return fiber_iocp_read(fe, buf, len);
return fiber_iocp_read(fe, buf, (int) len);
}
while (1) {
int ret;
ssize_t ret;
int err;
if (IS_READABLE(fe)) {
@ -536,7 +536,7 @@ ssize_t acl_fiber_writev(socket_t fd, const struct iovec *iov, int iovcnt)
}
while (1) {
ssize_t n = __sys_writev(fd, iov, iovcnt);
int n = (int) __sys_writev(fd, iov, iovcnt);
FILE_EVENT *fe;
int err;
@ -581,7 +581,7 @@ ssize_t acl_fiber_send(socket_t sockfd, const void *buf,
}
while (1) {
int n = __sys_send(sockfd, buf, len, flags);
int n = (int) __sys_send(sockfd, buf, len, flags);
FILE_EVENT *fe;
int err;
@ -616,7 +616,7 @@ ssize_t acl_fiber_send(socket_t sockfd, const void *buf,
int WINAPI acl_fiber_sendto(socket_t sockfd, const char *buf, int len,
int flags, const struct sockaddr *dest_addr, socklen_t addrlen)
#else
ssize_t acl_fiber_sendto(socket_t sockfd, const void *buf, int len,
ssize_t acl_fiber_sendto(socket_t sockfd, const void *buf, size_t len,
int flags, const struct sockaddr *dest_addr, socklen_t addrlen)
#endif
{
@ -625,7 +625,7 @@ ssize_t acl_fiber_sendto(socket_t sockfd, const void *buf, int len,
}
while (1) {
int n = __sys_sendto(sockfd, buf, len, flags,
int n = (int) __sys_sendto(sockfd, buf, len, flags,
dest_addr, addrlen);
FILE_EVENT *fe;
int err;

2
lib_fiber/cpp/include/fiber/fiber_cond.hpp
View File

@ -24,7 +24,7 @@ public:
* @param timeout {int} 超时等待时间（毫秒）
* @return {bool} 成功时返回 true，否则返回 false 表示超时
*/
bool wait(fiber_event& event, long long timeout = -1);
bool wait(fiber_event& event, int timeout = -1);
/**
* 唤醒在条件变量上的等待者，如果没有等待者则直接返回，运行行为和

2
lib_fiber/cpp/src/fiber_cond.cpp
View File

@ -16,7 +16,7 @@ fiber_cond::~fiber_cond(void)
acl_fiber_cond_free(cond_);
}
bool fiber_cond::wait(fiber_event& event, long long timeout /* = -1 */)
bool fiber_cond::wait(fiber_event& event, int timeout /* = -1 */)
{
ACL_FIBER_EVENT* ev = event.get_event();

35
lib_fiber/fiber.xcodeproj/project.pbxproj
View File

@ -93,6 +93,9 @@
070F35D72090225C00672EDC /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 070F358A2090225C00672EDC /* socket.c */; };
070F35D82090225C00672EDC /* stdafx.c in Sources */ = {isa = PBXBuildFile; fileRef = 070F358B2090225C00672EDC /* stdafx.c */; };
070F35D92090225C00672EDC /* stdafx.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F358C2090225C00672EDC /* stdafx.h */; };
07BED4CC21BA270A0060BBE4 /* fiber_cond.c in Sources */ = {isa = PBXBuildFile; fileRef = 07BED4CB21BA270A0060BBE4 /* fiber_cond.c */; };
07BED4CE21BA271F0060BBE4 /* fbase_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 07BED4CD21BA271F0060BBE4 /* fbase_event.c */; };
07BED4D021BA27530060BBE4 /* fiber_cond.h in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4CF21BA27530060BBE4 /* fiber_cond.h */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -183,6 +186,9 @@
070F358A2090225C00672EDC /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
070F358B2090225C00672EDC /* stdafx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stdafx.c; path = ../lib_fiber/c/src/stdafx.c; sourceTree = "<group>"; };
070F358C2090225C00672EDC /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stdafx.h; path = ../lib_fiber/c/src/stdafx.h; sourceTree = "<group>"; };
07BED4CB21BA270A0060BBE4 /* fiber_cond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fiber_cond.c; path = c/src/fiber_cond.c; sourceTree = "<group>"; };
07BED4CD21BA271F0060BBE4 /* fbase_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fbase_event.c; path = c/src/fbase_event.c; sourceTree = "<group>"; };
07BED4CF21BA27530060BBE4 /* fiber_cond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fiber_cond.h; path = c/include/fiber/fiber_cond.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -224,6 +230,8 @@
070F3528209021CB00672EDC /* src */ = {
isa = PBXGroup;
children = (
07BED4CD21BA271F0060BBE4 /* fbase_event.c */,
07BED4CB21BA270A0060BBE4 /* fiber_cond.c */,
070F353B2090225C00672EDC /* channel.c */,
070F353C2090225C00672EDC /* common */,
070F355F2090225C00672EDC /* common.h */,
@ -353,6 +361,7 @@
070F361820902FF300672EDC /* fiber */ = {
isa = PBXGroup;
children = (
07BED4CF21BA27530060BBE4 /* fiber_cond.h */,
070F35292090220400672EDC /* fiber_base.h */,
070F352A2090220400672EDC /* fiber_channel.h */,
070F352B2090220400672EDC /* fiber_define.h */,
@ -386,6 +395,7 @@
070F35A72090225C00672EDC /* pthread_patch.h in Headers */,
070F35992090225C00672EDC /* gettimeofday.h in Headers */,
070F35A32090225C00672EDC /* msg.h in Headers */,
07BED4D021BA27530060BBE4 /* fiber_cond.h in Headers */,
070F35A92090225C00672EDC /* ring.h in Headers */,
070F35AE2090225C00672EDC /* strops.h in Headers */,
070F35B92090225C00672EDC /* event_epoll.h in Headers */,
@ -477,6 +487,7 @@
070F35902090225C00672EDC /* array.c in Sources */,
070F35D02090225C00672EDC /* epoll.c in Sources */,
070F35B82090225C00672EDC /* event_epoll.c in Sources */,
07BED4CE21BA271F0060BBE4 /* fbase_event.c in Sources */,
070F35982090225C00672EDC /* gettimeofday.c in Sources */,
070F35D12090225C00672EDC /* getaddrinfo.c in Sources */,
070F358D2090225C00672EDC /* channel.c in Sources */,
@ -511,6 +522,7 @@
070F35D52090225C00672EDC /* poll.c in Sources */,
070F35942090225C00672EDC /* close_on_exec.c in Sources */,
070F35C42090225C00672EDC /* event.c in Sources */,
07BED4CC21BA270A0060BBE4 /* fiber_cond.c in Sources */,
070F35A02090225C00672EDC /* memory.c in Sources */,
070F35A22090225C00672EDC /* msg.c in Sources */,
070F358E2090225C00672EDC /* argv.c in Sources */,
@ -612,6 +624,17 @@
../lib_fiber/c/include,
../lib_fiber/c/src,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/zsx/work/github/acl/app/master/tools/lib_global,
/Users/zsx/work/github/acl/lib_acl/lib,
/Users/zsx/work/github/acl/lib_acl_cpp/lib,
"$(PROJECT_DIR)/lib",
/Users/zsx/work/github/acl/lib_protocol/lib,
/Users/zsx/work/github/acl/lib_rpc,
/Users/zsx/work/github/acl,
/Users/zsx/work/github/acl/test/url_coder,
);
OTHER_CFLAGS = "-Wno-deprecated-declarations";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -628,6 +651,17 @@
../lib_fiber/c/include,
../lib_fiber/c/src,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/zsx/work/github/acl/app/master/tools/lib_global,
/Users/zsx/work/github/acl/lib_acl/lib,
/Users/zsx/work/github/acl/lib_acl_cpp/lib,
"$(PROJECT_DIR)/lib",
/Users/zsx/work/github/acl/lib_protocol/lib,
/Users/zsx/work/github/acl/lib_rpc,
/Users/zsx/work/github/acl,
/Users/zsx/work/github/acl/test/url_coder,
);
OTHER_CFLAGS = "-Wno-deprecated-declarations";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -653,6 +687,7 @@
070F35262090217900672EDC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};

2
lib_fiber/fiber.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -7,7 +7,7 @@
<key>fiber.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>

17
lib_fiber/fiber_cpp.xcodeproj/project.pbxproj
View File

@ -28,6 +28,10 @@
070F361520902FDA00672EDC /* master_fiber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070F360B20902FDA00672EDC /* master_fiber.cpp */; };
070F361620902FDA00672EDC /* stdafx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070F360C20902FDA00672EDC /* stdafx.cpp */; };
070F361720902FDA00672EDC /* stdafx.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 070F360D20902FDA00672EDC /* stdafx.hpp */; };
07BED4D221BA278D0060BBE4 /* fiber_cond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07BED4D121BA278D0060BBE4 /* fiber_cond.cpp */; };
07BED4D421BA27B70060BBE4 /* fiber_cond.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4D321BA27B70060BBE4 /* fiber_cond.hpp */; };
07BED4D621BA27BE0060BBE4 /* fiber_tbox.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4D521BA27BE0060BBE4 /* fiber_tbox.hpp */; };
07BED4D821BA27C30060BBE4 /* libfiber.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4D721BA27C30060BBE4 /* libfiber.hpp */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -53,6 +57,10 @@
070F360B20902FDA00672EDC /* master_fiber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = master_fiber.cpp; path = ../lib_fiber/cpp/src/master_fiber.cpp; sourceTree = "<group>"; };
070F360C20902FDA00672EDC /* stdafx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stdafx.cpp; path = ../lib_fiber/cpp/src/stdafx.cpp; sourceTree = "<group>"; };
070F360D20902FDA00672EDC /* stdafx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = stdafx.hpp; path = ../lib_fiber/cpp/src/stdafx.hpp; sourceTree = "<group>"; };
07BED4D121BA278D0060BBE4 /* fiber_cond.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fiber_cond.cpp; path = cpp/src/fiber_cond.cpp; sourceTree = "<group>"; };
07BED4D321BA27B70060BBE4 /* fiber_cond.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fiber_cond.hpp; sourceTree = "<group>"; };
07BED4D521BA27BE0060BBE4 /* fiber_tbox.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fiber_tbox.hpp; sourceTree = "<group>"; };
07BED4D721BA27C30060BBE4 /* libfiber.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = libfiber.hpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -105,6 +113,7 @@
070F35F220902DB100672EDC /* src */ = {
isa = PBXGroup;
children = (
07BED4D121BA278D0060BBE4 /* fiber_cond.cpp */,
070F360420902FDA00672EDC /* channel.cpp */,
070F360520902FDA00672EDC /* fiber_event.cpp */,
070F360620902FDA00672EDC /* fiber_lock.cpp */,
@ -122,6 +131,9 @@
070F35F320902DDC00672EDC /* fiber */ = {
isa = PBXGroup;
children = (
07BED4D721BA27C30060BBE4 /* libfiber.hpp */,
07BED4D521BA27BE0060BBE4 /* fiber_tbox.hpp */,
07BED4D321BA27B70060BBE4 /* fiber_cond.hpp */,
070F35F420902DDC00672EDC /* channel.hpp */,
070F35F520902DDC00672EDC /* fiber.hpp */,
070F35F620902DDC00672EDC /* fiber_cpp_define.hpp */,
@ -146,9 +158,12 @@
070F35FC20902DDC00672EDC /* channel.hpp in Headers */,
070F35E920902D9800672EDC /* fiber_cppPriv.h in Headers */,
070F35E720902D9800672EDC /* fiber_cpp.h in Headers */,
07BED4D621BA27BE0060BBE4 /* fiber_tbox.hpp in Headers */,
070F35FD20902DDC00672EDC /* fiber.hpp in Headers */,
07BED4D421BA27B70060BBE4 /* fiber_cond.hpp in Headers */,
070F360220902DDC00672EDC /* lib_fiber.hpp in Headers */,
070F35FE20902DDC00672EDC /* fiber_cpp_define.hpp in Headers */,
07BED4D821BA27C30060BBE4 /* libfiber.hpp in Headers */,
070F360320902DDC00672EDC /* master_fiber.hpp in Headers */,
070F360020902DDC00672EDC /* fiber_lock.hpp in Headers */,
070F360120902DDC00672EDC /* fiber_sem.hpp in Headers */,
@ -217,6 +232,7 @@
070F360F20902FDA00672EDC /* fiber_event.cpp in Sources */,
070F35EB20902D9800672EDC /* fiber_cpp.cp in Sources */,
070F361420902FDA00672EDC /* fiber.cpp in Sources */,
07BED4D221BA278D0060BBE4 /* fiber_cond.cpp in Sources */,
070F360E20902FDA00672EDC /* channel.cpp in Sources */,
070F361520902FDA00672EDC /* master_fiber.cpp in Sources */,
070F361020902FDA00672EDC /* fiber_lock.cpp in Sources */,
@ -361,6 +377,7 @@
070F35F020902D9800672EDC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};

2
lib_fiber/fiber_cpp.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -7,7 +7,7 @@
<key>fiber_cpp.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>

BIN
lib_fiber/samples/thread_tbox/thread_tbox Executable file
View File

Binary file not shown.

77
lib_protocol/protocol.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/protocol.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A457091E6FC3D3002C9B3C"
BuildableName = "libprotocol.a"
BlueprintName = "protocol"
ReferencedContainer = "container:protocol.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A457091E6FC3D3002C9B3C"
BuildableName = "libprotocol.a"
BlueprintName = "protocol"
ReferencedContainer = "container:protocol.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "07A457091E6FC3D3002C9B3C"
BuildableName = "libprotocol.a"
BlueprintName = "protocol"
ReferencedContainer = "container:protocol.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
lib_protocol/protocol.xcodeproj/xcuserdata/zsx.xcuserdatad/xcschemes/xcschememanagement.plist Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>protocol.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>07A457091E6FC3D3002C9B3C</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>