Skip to content

Commit a5dc2c1

Browse files
halx99halx99
committed
Update yasio to v4.3.2
1 parent 0513013 commit a5dc2c1

File tree

9 files changed

+75
-67
lines changed

9 files changed

+75
-67
lines changed

‎.github/workflows/update-plugins.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: Download artifacts from workflow build
28-
uses: dawidd6/action-download-artifact@v3
28+
uses: dawidd6/action-download-artifact@v6
2929
with:
3030
# Optional, GitHub token
3131
github_token: ${{secrets.GITHUB_TOKEN}}

‎NativeLibs/yasio/1k/1kiss.ps1

+54-46
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ $1k = [_1kiss]::new()
195195
# x.y.z~x2.y2.z2 : range
196196
$manifest = @{
197197
msvc = '14.39+'; # cl.exe @link.exe 14.39 VS2022 17.9.x
198+
vs = '12.0+';
198199
ndk = 'r23c';
199200
xcode = '13.0.0+'; # range
200201
# _EMIT_STL_ERROR(STL1000, "Unexpected compiler version, expected Clang xx.x.x or newer.");
@@ -597,7 +598,8 @@ function find_prog($name, $path = $null, $mode = 'ONLY', $cmd = $null, $params =
597598
else {
598599
if (!$preferredVer.Contains('*')) {
599600
$checkVerCond = '$(version_eq $foundVer $preferredVer)'
600-
} else {
601+
}
602+
else {
601603
$wildcardVer = $preferredVer
602604
$preferredVer = $wildcardVer.TrimEnd('.*')
603605
$checkVerCond = '$(version_like $foundVer $wildcardVer)'
@@ -752,6 +754,46 @@ function fetch_pkg($url, $exrep = $null) {
752754
if ($pfn_rename) { &$pfn_rename }
753755
}
754756

757+
758+
#
759+
# Find latest installed: Visual Studio 12 2013 +
760+
# installationVersion
761+
# installationPath
762+
# instanceId: used for EnterDevShell
763+
# result:
764+
# $Global:VS_INST
765+
#
766+
$Global:VS_INST = $null
767+
function find_vs() {
768+
if (!$Global:VS_INST) {
769+
$VSWHERE_EXE = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
770+
$eap = $ErrorActionPreference
771+
$ErrorActionPreference = 'SilentlyContinue'
772+
773+
$required_vs_ver = $manifest['vs']
774+
if (!$required_vs_ver) { $required_vs_ver = '12.0+' }
775+
776+
$require_comps = @('Microsoft.Component.MSBuild', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64')
777+
$vs_installs = ConvertFrom-Json "$(&$VSWHERE_EXE -version $required_vs_ver.TrimEnd('+') -format 'json' -requires $require_comps)"
778+
$ErrorActionPreference = $eap
779+
780+
if ($vs_installs) {
781+
$vs_inst_latest = $null
782+
$vs_ver = ''
783+
foreach ($vs_inst in $vs_installs) {
784+
$inst_ver = [VersionEx]$vs_inst.installationVersion
785+
if ($vs_ver -lt $inst_ver) {
786+
$vs_ver = $inst_ver
787+
$vs_inst_latest = $vs_inst
788+
}
789+
}
790+
$Global:VS_INST = $vs_inst_latest
791+
} else {
792+
throw "No suitable visual studio installed, required: $required_vs_ver"
793+
}
794+
}
795+
}
796+
755797
# setup nuget, not add to path
756798
function setup_nuget() {
757799
if (!$manifest['nuget']) { return $null }
@@ -1231,11 +1273,12 @@ function setup_emsdk() {
12311273
function setup_msvc() {
12321274
$cl_prog, $cl_ver = find_prog -name 'msvc' -cmd 'cl' -silent $true -usefv $true
12331275
if (!$cl_prog) {
1234-
if ($VS_INST) {
1235-
Import-Module "$VS_PATH\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
1276+
if ($Global:VS_INST) {
1277+
$vs_path = $Global:VS_INST.installationPath
1278+
Import-Module "$vs_path\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
12361279
$dev_cmd_args = "-arch=$target_cpu -host_arch=x64 -no_logo"
12371280
if (!$manifest['msvc'].EndsWith('+')) { $dev_cmd_args += " -vcvars_ver=$cl_ver" }
1238-
Enter-VsDevShell -VsInstanceId $VS_INST.instanceId -SkipAutomaticLocation -DevCmdArguments $dev_cmd_args
1281+
Enter-VsDevShell -VsInstanceId $Global:VS_INST.instanceId -SkipAutomaticLocation -DevCmdArguments $dev_cmd_args
12391282

12401283
$cl_prog, $cl_ver = find_prog -name 'msvc' -cmd 'cl' -silent $true -usefv $true
12411284
$1k.println("Using msvc: $cl_prog, version: $cl_ver")
@@ -1297,44 +1340,6 @@ function setup_gclient() {
12971340
$env:DEPOT_TOOLS_WIN_TOOLCHAIN = 0
12981341
}
12991342

1300-
#
1301-
# Find latest installed: Visual Studio 12 2013 +
1302-
# installationVersion
1303-
# instanceId EnterDevShell can use it
1304-
# result:
1305-
# $Global:VS_VERSION
1306-
# $Global:VS_INST
1307-
# $Global:VS_PATH
1308-
#
1309-
$Global:VS_VERSION = $null
1310-
$Global:VS_PATH = $null
1311-
$Global:VS_INST = $null
1312-
function find_vs_latest() {
1313-
$vs_version = [VersionEx]'12.0'
1314-
if (!$Global:VS_INST) {
1315-
$VSWHERE_EXE = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
1316-
$eap = $ErrorActionPreference
1317-
$ErrorActionPreference = 'SilentlyContinue'
1318-
1319-
$vs_installs = ConvertFrom-Json "$(&$VSWHERE_EXE -version '12.0' -format 'json')"
1320-
$ErrorActionPreference = $eap
1321-
1322-
if ($vs_installs) {
1323-
$vs_inst_latest = $null
1324-
foreach ($vs_inst in $vs_installs) {
1325-
$inst_ver = [VersionEx]$vs_inst.installationVersion
1326-
if ($vs_version -lt $inst_ver) {
1327-
$vs_version = $inst_ver
1328-
$vs_inst_latest = $vs_inst
1329-
}
1330-
}
1331-
$Global:VS_PATH = $vs_inst_latest.installationPath
1332-
$Global:VS_INST = $vs_inst_latest
1333-
}
1334-
}
1335-
$Global:VS_VERSION = $vs_version
1336-
}
1337-
13381343
# preprocess methods:
13391344
# <param>-inputOptions</param> [CMAKE_OPTIONS]
13401345
function preprocess_win([string[]]$inputOptions) {
@@ -1350,21 +1355,23 @@ function preprocess_win([string[]]$inputOptions) {
13501355
$arch = if ($options.a -eq 'x86') { 'Win32' } else { $options.a }
13511356

13521357
# arch
1353-
if ($VS_VERSION -ge [VersionEx]'16.0') {
1358+
$vs_ver = [VersionEx]$Global:VS_INST.installationVersion
1359+
if ($vs_ver -ge [VersionEx]'16.0') {
13541360
$outputOptions += '-A', $arch
13551361
if ($TOOLCHAIN_VER) {
13561362
$outputOptions += "-Tv$TOOLCHAIN_VER"
13571363
}
13581364
}
13591365
else {
1366+
if (!$TOOLCHAIN_VER) { $TOOLCHAIN_VER = "$($vs_ver.Major)0" }
13601367
$gens = @{
13611368
'120' = 'Visual Studio 12 2013';
13621369
'140' = 'Visual Studio 14 2015'
13631370
"150" = 'Visual Studio 15 2017';
13641371
}
13651372
$Script:cmake_generator = $gens[$TOOLCHAIN_VER]
13661373
if (!$Script:cmake_generator) {
1367-
throw "Unsupported toolchain: $TOOLCHAIN"
1374+
throw "Unsupported toolchain: $TOOLCHAIN$TOOLCHAIN_VER"
13681375
}
13691376
if ($options.a -eq "x64") {
13701377
$Script:cmake_generator += ' Win64'
@@ -1558,7 +1565,7 @@ $null = setup_glslcc
15581565
$cmake_prog, $Script:cmake_ver = setup_cmake
15591566

15601567
if ($Global:is_win_family) {
1561-
find_vs_latest
1568+
find_vs
15621569
$nuget_prog = setup_nuget
15631570
}
15641571

@@ -1614,7 +1621,8 @@ if (!$setupOnly) {
16141621
if ($is_host_target) {
16151622
if (!$is_host_cpu) {
16161623
$out_dir = "${prefix}${TARGET_CPU}"
1617-
} else {
1624+
}
1625+
else {
16181626
$out_dir = $prefix.TrimEnd("_")
16191627
}
16201628
}

‎NativeLibs/yasio/1k/install-pwsh.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mkdir -p $cacheDir
1212

1313
pwsh_ver=$1
1414
if [ "$pwsh_ver" = "" ] ; then
15-
pwsh_ver='7.4.4'
15+
pwsh_ver='7.4.6'
1616
fi
1717

1818
pwsh_min_ver=$2
@@ -64,8 +64,8 @@ elif [ $HOST_OS = 'Linux' ] ; then
6464
curl -L "https://github.com/PowerShell/PowerShell/releases/download/v$pwsh_ver/$pwsh_pkg" -o "$pwsh_pkg_out"
6565
fi
6666
sudo_cmd=$(which sudo)
67-
$sudo_cmd dpkg -i "$pwsh_pkg_out"
68-
$sudo_cmd apt-get install -f
67+
$sudo_cmd dpkg -i --ignore-depends=libicu72 "$pwsh_pkg_out"
68+
$sudo_cmd apt-get install -f powershell
6969
elif command -v pacman > /dev/null; then # Linux distro: Arch
7070
# refer: https://ephos.github.io/posts/2018-9-17-Pwsh-ArchLinux
7171
# available pwsh version, refer to: https://aur.archlinux.org/packages/powershell-bin

‎NativeLibs/yasio/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"versions": {
3-
"1kdist": "v90"
3+
"1kdist": "v93"
44
},
55
"mirrors": {
66
"github": {

‎NativeLibs/yasio/yasio/config.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ SOFTWARE.
205205
/*
206206
** The yasio version macros
207207
*/
208-
#define YASIO_VERSION_NUM 0x040301
208+
#define YASIO_VERSION_NUM 0x040302
209209

210210
/*
211211
** The macros used by io_service.

‎NativeLibs/yasio/yasio/fsutils.hpp ‎NativeLibs/yasio/yasio/file.hpp

File renamed without changes.

‎NativeLibs/yasio/yasio/io_service.cpp

+11-12
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,7 @@ int io_transport_ssl::do_ssl_handshake(int& error)
533533
return -1;
534534
};
535535
this->write_cb_ = [this](const void* data, int len, const ip::endpoint*, int& error) { return yssl_write(ssl_, data, len, error); };
536-
537-
YASIO_KLOGD("[index: %d] the connection #%u <%s> --> <%s> is established.", ctx_->index_, this->id_, this->local_endpoint().to_string().c_str(),
538-
this->remote_endpoint().to_string().c_str());
539-
get_service().fire_event(ctx_->index_, YEK_ON_OPEN, 0, this);
540-
536+
get_service().notify_connect_succeed(this);
541537
error = EWOULDBLOCK;
542538
}
543539
else
@@ -1708,16 +1704,19 @@ void io_service::active_transport(transport_handle_t t)
17081704
#endif
17091705
}
17101706
if (!yasio__testbits(ctx->properties_, YCM_SSL))
1711-
{
1712-
YASIO__UNUSED_PARAM(s);
1713-
YASIO_KLOGV("[index: %d] sndbuf=%d, rcvbuf=%d", ctx->index_, s->get_optval<int>(SOL_SOCKET, SO_SNDBUF), s->get_optval<int>(SOL_SOCKET, SO_RCVBUF));
1714-
YASIO_KLOGD("[index: %d] the connection #%u <%s> --> <%s> is established.", ctx->index_, t->id_, t->local_endpoint().to_string().c_str(),
1715-
t->remote_endpoint().to_string().c_str());
1716-
this->fire_event(ctx->index_, YEK_ON_OPEN, 0, t);
1717-
}
1707+
notify_connect_succeed(t);
17181708
else if (yasio__testbits(ctx->properties_, YCM_CLIENT))
17191709
this->wakeup();
17201710
}
1711+
void io_service::notify_connect_succeed(transport_handle_t t)
1712+
{
1713+
auto& s = t->socket_;
1714+
auto ctx = t->ctx_;
1715+
YASIO_KLOGD("[index: %d] the connection #%u <%s> --> <%s> is established(sndbuf=%d, rcvbuf=%d).", ctx->index_, t->id_,
1716+
t->local_endpoint().to_string().c_str(), t->remote_endpoint().to_string().c_str(), s->get_optval<int>(SOL_SOCKET, SO_SNDBUF),
1717+
s->get_optval<int>(SOL_SOCKET, SO_RCVBUF));
1718+
fire_event(ctx->index_, YEK_ON_OPEN, 0, t);
1719+
}
17211720
transport_handle_t io_service::allocate_transport(io_channel* ctx, xxsocket_ptr&& s)
17221721
{
17231722
transport_handle_t transport;

‎NativeLibs/yasio/yasio/io_service.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
11861186
YASIO__DECL void handle_connect_succeed(transport_handle_t);
11871187
YASIO__DECL void handle_connect_failed(io_channel*, int ec);
11881188
YASIO__DECL void active_transport(transport_handle_t);
1189+
YASIO__DECL void notify_connect_succeed(transport_handle_t);
11891190

11901191
YASIO__DECL transport_handle_t allocate_transport(io_channel*, xxsocket_ptr&&);
11911192
YASIO__DECL void deallocate_transport(transport_handle_t);

‎NativeLibs/yasio/yasio/string.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ class basic_string {
243243
const_iterator end() const YASIO__NOEXCEPT { return begin() + _Mysize; }
244244
#pragma endregion
245245

246-
pointer data() YASIO__NOEXCEPT { return _Myfirst ? _Myfirst : reinterpret_cast<pointer>(&_Myfirst); }
247-
const_pointer data() const YASIO__NOEXCEPT { return _Myfirst ? _Myfirst : reinterpret_cast<const_pointer>(&_Myfirst); }
248-
const_pointer c_str() const YASIO__NOEXCEPT { return this->data(); }
246+
pointer data() YASIO__NOEXCEPT { return _Myfirst; }
247+
const_pointer data() const YASIO__NOEXCEPT { return _Myfirst; }
248+
const_pointer c_str() const YASIO__NOEXCEPT { return _Myfirst ? _Myfirst : reinterpret_cast<pointer>(&_Myfirst);; }
249249
const_reference operator[](size_type index) const { return this->at(index); }
250250
reference operator[](size_type index) { return this->at(index); }
251251
const_reference at(size_type index) const

0 commit comments

Comments
 (0)