From ba76a210b8615c6e8c308e1810770d25fe924e6c Mon Sep 17 00:00:00 2001 From: zhengshuxin Date: Mon, 21 Nov 2022 20:43:45 +0800 Subject: [PATCH] build ok by xcode --- lib_acl_cpp/acl_cpp.xcodeproj/project.pbxproj | 10 ++++++++++ lib_fiber/cpp/src/tcp_keeper.cpp | 2 +- lib_fiber/fiber_cpp.xcodeproj/project.pbxproj | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib_acl_cpp/acl_cpp.xcodeproj/project.pbxproj b/lib_acl_cpp/acl_cpp.xcodeproj/project.pbxproj index 05e8219e8..6eee2a05d 100644 --- a/lib_acl_cpp/acl_cpp.xcodeproj/project.pbxproj +++ b/lib_acl_cpp/acl_cpp.xcodeproj/project.pbxproj @@ -207,6 +207,7 @@ 07A468751E6FCCF1002C9B3C /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A467BF1E6FCCF1002C9B3C /* stream.cpp */; }; 07A4D1731E94E4BC00790E12 /* mbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A4D1721E94E4BC00790E12 /* mbox.cpp */; }; 07BED4DB22AFC5B30060BBE4 /* http_aclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07BED4DA22AFC5B30060BBE4 /* http_aclient.cpp */; }; + 07C51BA3292BA8A700231646 /* thread_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C51BA2292BA8A700231646 /* thread_queue.cpp */; }; 700C4C1625F8E5A4004955AD /* mqtt_aclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 700C4C1525F8E5A4004955AD /* mqtt_aclient.cpp */; }; 7017904424C542140016B873 /* redis_role.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7017903E24C542140016B873 /* redis_role.cpp */; }; 7017904524C542140016B873 /* redis_master.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7017903F24C542140016B873 /* redis_master.cpp */; }; @@ -693,6 +694,10 @@ 07BEA6C3214F79E20060BBE4 /* WebSocketServlet.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WebSocketServlet.hpp; sourceTree = ""; }; 07BED4D922AFC5710060BBE4 /* http_aclient.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_aclient.hpp; sourceTree = ""; }; 07BED4DA22AFC5B30060BBE4 /* http_aclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_aclient.cpp; sourceTree = ""; }; + 07C51BA2292BA8A700231646 /* thread_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_queue.cpp; sourceTree = ""; }; + 07C51BA4292BA8D600231646 /* tbox_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tbox_array.hpp; sourceTree = ""; }; + 07C51BA5292BA8D600231646 /* box.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = box.hpp; sourceTree = ""; }; + 07C51BA6292BA8D600231646 /* dbuf_allocator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dbuf_allocator.hpp; sourceTree = ""; }; 700C4C1425F8E594004955AD /* mqtt_aclient.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = mqtt_aclient.hpp; path = mqtt/mqtt_aclient.hpp; sourceTree = ""; }; 700C4C1525F8E5A4004955AD /* mqtt_aclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mqtt_aclient.cpp; path = mqtt/mqtt_aclient.cpp; sourceTree = ""; }; 7017903E24C542140016B873 /* redis_role.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = redis_role.cpp; sourceTree = ""; }; @@ -1137,6 +1142,7 @@ 07A4678C1E6FCCF1002C9B3C /* stdlib */ = { isa = PBXGroup; children = ( + 07C51BA2292BA8A700231646 /* thread_queue.cpp */, 070F351120901EE100672EDC /* diff_manager.cpp */, 070F351220901EE100672EDC /* diff_object.cpp */, 070F351320901EE100672EDC /* diff_string.cpp */, @@ -1554,6 +1560,9 @@ 07A469191E6FD404002C9B3C /* stdlib */ = { isa = PBXGroup; children = ( + 07C51BA5292BA8D600231646 /* box.hpp */, + 07C51BA6292BA8D600231646 /* dbuf_allocator.hpp */, + 07C51BA4292BA8D600231646 /* tbox_array.hpp */, 07BEA6BC214F79050060BBE4 /* thread_queue.hpp */, 07BEA6BB214F78F40060BBE4 /* tbox.hpp */, 070F350E20901E6B00672EDC /* diff_manager.hpp */, @@ -1871,6 +1880,7 @@ 07A468331E6FCCF1002C9B3C /* redis_key.cpp in Sources */, 07A468141E6FCCF1002C9B3C /* rec_type.cpp in Sources */, 07A467E51E6FCCF1002C9B3C /* disque_job.cpp in Sources */, + 07C51BA3292BA8A700231646 /* thread_queue.cpp in Sources */, 07A4680A1E6FCCF1002C9B3C /* memcache.cpp in Sources */, 07A467F21E6FCCF1002C9B3C /* http_pipe.cpp in Sources */, 07A467F41E6FCCF1002C9B3C /* http_request_manager.cpp in Sources */, diff --git a/lib_fiber/cpp/src/tcp_keeper.cpp b/lib_fiber/cpp/src/tcp_keeper.cpp index 93a3dc8fc..871f5f98f 100644 --- a/lib_fiber/cpp/src/tcp_keeper.cpp +++ b/lib_fiber/cpp/src/tcp_keeper.cpp @@ -113,7 +113,7 @@ void tcp_keeper::update(const char* addr, double cost) socket_stream* tcp_keeper::peek(const char* addr, bool* hit /* = NULL */, bool sync /* = false */) { - bool found; + bool found = false; if (addr == NULL || *addr == 0) { logger_fatal("addr null, addr=%s", addr ? addr : "null"); diff --git a/lib_fiber/fiber_cpp.xcodeproj/project.pbxproj b/lib_fiber/fiber_cpp.xcodeproj/project.pbxproj index 44d20cb54..6c41469a4 100644 --- a/lib_fiber/fiber_cpp.xcodeproj/project.pbxproj +++ b/lib_fiber/fiber_cpp.xcodeproj/project.pbxproj @@ -40,6 +40,8 @@ 07BED4EA22AFCB060060BBE4 /* keeper_conns.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4E322AFCB060060BBE4 /* keeper_conns.hpp */; }; 07BED4EB22AFCB060060BBE4 /* keeper_waiter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07BED4E422AFCB060060BBE4 /* keeper_waiter.cpp */; }; 07BED4EC22AFCB060060BBE4 /* keeper_waiter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07BED4E522AFCB060060BBE4 /* keeper_waiter.hpp */; }; + 07C51B9F292BA87300231646 /* fiber_redis_pipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C51B9E292BA87300231646 /* fiber_redis_pipeline.cpp */; }; + 07C51BA1292BA88200231646 /* fiber_redis_pipeline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 07C51BA0292BA88200231646 /* fiber_redis_pipeline.hpp */; }; 70147AA7292616CE00367292 /* http_server.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 70147AA4292616CE00367292 /* http_server.hpp */; }; 70147AA8292616CE00367292 /* http_servlet.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 70147AA5292616CE00367292 /* http_servlet.hpp */; }; 70147AA9292616CE00367292 /* go_fiber.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 70147AA6292616CE00367292 /* go_fiber.hpp */; }; @@ -87,6 +89,8 @@ 07BED4E322AFCB060060BBE4 /* keeper_conns.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = keeper_conns.hpp; sourceTree = ""; }; 07BED4E422AFCB060060BBE4 /* keeper_waiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keeper_waiter.cpp; sourceTree = ""; }; 07BED4E522AFCB060060BBE4 /* keeper_waiter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = keeper_waiter.hpp; sourceTree = ""; }; + 07C51B9E292BA87300231646 /* fiber_redis_pipeline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fiber_redis_pipeline.cpp; path = cpp/src/fiber_redis_pipeline.cpp; sourceTree = ""; }; + 07C51BA0292BA88200231646 /* fiber_redis_pipeline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fiber_redis_pipeline.hpp; sourceTree = ""; }; 70147AA4292616CE00367292 /* http_server.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_server.hpp; sourceTree = ""; }; 70147AA5292616CE00367292 /* http_servlet.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_servlet.hpp; sourceTree = ""; }; 70147AA6292616CE00367292 /* go_fiber.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = go_fiber.hpp; sourceTree = ""; }; @@ -150,6 +154,7 @@ 070F35F220902DB100672EDC /* src */ = { isa = PBXGroup; children = ( + 07C51B9E292BA87300231646 /* fiber_redis_pipeline.cpp */, 70147AAA292616E600367292 /* fiber_mutex.cpp */, 702452EF2897BD0D00B7449B /* wait_group.cpp */, 70E41F5626F3293E0068042B /* tcp_keeper.cpp */, @@ -173,6 +178,7 @@ 070F35F320902DDC00672EDC /* fiber */ = { isa = PBXGroup; children = ( + 07C51BA0292BA88200231646 /* fiber_redis_pipeline.hpp */, 70F62E4F2926432F0010B1F6 /* fiber_mutex.hpp */, 70147AA6292616CE00367292 /* go_fiber.hpp */, 70147AA4292616CE00367292 /* http_server.hpp */, @@ -232,6 +238,7 @@ 07BED4D421BA27B70060BBE4 /* fiber_cond.hpp in Headers */, 070F360220902DDC00672EDC /* lib_fiber.hpp in Headers */, 07BED4EA22AFCB060060BBE4 /* keeper_conns.hpp in Headers */, + 07C51BA1292BA88200231646 /* fiber_redis_pipeline.hpp in Headers */, 07BED4EC22AFCB060060BBE4 /* keeper_waiter.hpp in Headers */, 070F35FE20902DDC00672EDC /* fiber_cpp_define.hpp in Headers */, 07BED4E822AFCB060060BBE4 /* keeper_conn.hpp in Headers */, @@ -311,6 +318,7 @@ 07BED4E722AFCB060060BBE4 /* keeper_conn.cpp in Sources */, 070F361420902FDA00672EDC /* fiber.cpp in Sources */, 07BED4D221BA278D0060BBE4 /* fiber_cond.cpp in Sources */, + 07C51B9F292BA87300231646 /* fiber_redis_pipeline.cpp in Sources */, 070F360E20902FDA00672EDC /* channel.cpp in Sources */, 70E41F5926F3293E0068042B /* tcp_keeper.cpp in Sources */, 070F361520902FDA00672EDC /* master_fiber.cpp in Sources */,