diff --git a/Makefile b/Makefile index 3d843c3e9..61b5d198d 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ endif ############################################################################## .PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_one -VERSION = 3.5.3-23 +VERSION = 3.6.0-0 default: build_one acl_master help h: diff --git a/changes.txt b/changes.txt index 9b65761fd..6b933fe9e 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,9 @@ 修改历史列表： ------------------------------------------------------------------------ +117) 2022.12.1 -- acl 3.6.0-0 版本发布, 协程模块增加了 io_uring 新的引擎支持, +重新设计并实现了新的协程-线程共享锁 fiber_mutex 及 fiber_cond. + 116) 2021.10.14 -- acl 3.5.3-1 版本发布，主要优化了协程模块在windows平台的使用 115) 2020.1.12 --- acl 3.5.1-1 版本发布！主要是优化了 ssl 模块的接口 114) 2020.1.9 --- acl 3.5.1 版本发布！ diff --git a/lib_acl/lib_acl.rc b/lib_acl/lib_acl.rc index 9d946d9c6..9f705894f 100644 --- a/lib_acl/lib_acl.rc +++ b/lib_acl/lib_acl.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "Ϊƽ̨C⣬ͨѶܵȹ" VALUE "FileDescription", "acl " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2015" + VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl " - VALUE "ProductVersion", "3, 5, 3, 23" + VALUE "ProductVersion", "3, 6, 0, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2017.rc b/lib_acl/lib_acl_vc2017.rc index 977996f6f..7c03832a5 100644 --- a/lib_acl/lib_acl_vc2017.rc +++ b/lib_acl/lib_acl_vc2017.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "Ϊƽ̨C⣬ͨѶܵȹ" VALUE "FileDescription", "acl " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2015" + VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl " - VALUE "ProductVersion", "3, 5, 3, 23" + VALUE "ProductVersion", "3, 6, 0, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2019.rc b/lib_acl/lib_acl_vc2019.rc index 977996f6f..7c03832a5 100644 --- a/lib_acl/lib_acl_vc2019.rc +++ b/lib_acl/lib_acl_vc2019.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "Ϊƽ̨C⣬ͨѶܵȹ" VALUE "FileDescription", "acl " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2015" + VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl " - VALUE "ProductVersion", "3, 5, 3, 23" + VALUE "ProductVersion", "3, 6, 0, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/src/init/acl_init.c b/lib_acl/src/init/acl_init.c index 294673658..53aa218f1 100644 --- a/lib_acl/src/init/acl_init.c +++ b/lib_acl/src/init/acl_init.c @@ -25,7 +25,7 @@ #include "init.h" -static char *version = "3.5.3-23 20220919-10:59"; +static char *version = "3.6.0-0 20221201-19:45"; const char *acl_version(void) { diff --git a/lib_acl_cpp/lib_acl_cpp_vc2003.rc b/lib_acl_cpp/lib_acl_cpp_vc2003.rc index 9a8b2e284..99c4a7ecf 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2003.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2003.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "zsx" VALUE "FileDescription", "acl_cpp " - VALUE "FileVersion", "3, 5, 3, 23" + VALUE "FileVersion", "3, 6, 0, 0" VALUE "InternalName", "lib_acl_" - VALUE "LegalCopyright", "acl_cpp (C) 2015" + VALUE "LegalCopyright", "acl_cpp (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", "acl_cpp " - VALUE "ProductVersion", "3, 5, 3, 23" + VALUE "ProductVersion", "3, 6, 0, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2008.rc b/lib_acl_cpp/lib_acl_cpp_vc2008.rc index fb5015cb5..bfa8505c8 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2008.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2008.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "zsx" VALUE "FileDescription", "acl_cpp " - VALUE "FileVersion", "3, 5, 3, 23" + VALUE "FileVersion", "3, 6, 0, 0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "acl_cpp (C) 2015" + VALUE "LegalCopyright", "acl_cpp (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", "acl_cpp " - VALUE "ProductVersion", "3, 5, 3, 23" + VALUE "ProductVersion", "3, 6, 0, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2010.rc b/lib_acl_cpp/lib_acl_cpp_vc2010.rc index 6a7f089a9..a1b267238 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2010.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2010.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2012.rc b/lib_acl_cpp/lib_acl_cpp_vc2012.rc index f58138c4e..11573794a 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2012.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2012.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2013.rc b/lib_acl_cpp/lib_acl_cpp_vc2013.rc index 41139c20c..16cd6dc3d 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2013.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2013.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2015.rc b/lib_acl_cpp/lib_acl_cpp_vc2015.rc index ee34035fc..7c60fcdf9 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2015.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2015.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2017.rc b/lib_acl_cpp/lib_acl_cpp_vc2017.rc index fd7d4c313..46475eff8 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2017.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2017.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2019.rc b/lib_acl_cpp/lib_acl_cpp_vc2019.rc index 74d8be24c..ce7710609 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2019.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2019.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,3,23 - PRODUCTVERSION 3,5,3,23 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "ͨõC++" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp " - VALUE "FileVersion", "3.5.3.23" + VALUE "FileVersion", "3.6.0.0" VALUE "InternalName", "lib_acl_cpp" - VALUE "LegalCopyright", "Ȩ (C) 2015" + VALUE "LegalCopyright", "Ȩ (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp " - VALUE "ProductVersion", "3.5.3.23" + VALUE "ProductVersion", "3.6.0.0" END END BLOCK "VarFileInfo" diff --git a/lib_fiber/changes.txt b/lib_fiber/changes.txt index 8373068a2..bdc66fab2 100644 --- a/lib_fiber/changes.txt +++ b/lib_fiber/changes.txt @@ -1,4 +1,10 @@ +117) 2022.10.1-12.1 +117) feature: 重新设计了更为通用的协程-线程共享的协程锁--fiber_mutex, 占用更少 +的资源,并具有更高的性能 +118) feature: 支持 Linux 下的新的 IO 引擎 io_uring, 可以同时支持网络套接字及 +文件套接字,从而更为通用 + 116) 2021.10.10-12 116.1) bugfix: 修复采用 iocp 引擎时的问题 diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec index cdf95cfdb..c5616103c 100644 --- a/packaging/acl-libs.spec +++ b/packaging/acl-libs.spec @@ -1,8 +1,8 @@ -%define release_id 23 +%define release_id 0 Summary: The powerful c/c++ library Name: acl-libs -Version: 3.5.3 +Version: 3.6.0 Release: %{release_id} Group: System/Libs License: IBM @@ -45,6 +45,11 @@ rm -rf %{buildroot} %changelog +* Wed Dec 01 2022 shuxin.zheng shuxin.zheng@qq.com 3.6.0-0-20221201.20 +- feature: fiber module supports io_uring +- optimize&feature: add the new fiber lock named as fiber_mutex +- some other optimize and bugs fixed + * Wed Sep 19 2022 shuxin.zheng shuxin.zheng@qq.com 3.5.3-23-20220919.10 - optimize: limit the minmal thread stack size to 4M when creating new thread on Win64 to avoid stack crash.