fix speed test under non-english linux. #5929
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waruqi
reviewed
Dec 5, 2024
| data = try { function () return os.iorun("%s -c 1 -W 1 -n %s", ping.program, host) end } | ||
| if not data then | ||
| data = try { function () return os.iorun("%s -c 1 -W 1 %s", ping.program, host) end } | ||
| end | ||
| end | ||
| local timeval = "65535" | ||
| if data then | ||
| timeval = data:match("time[=<]([%d%s%.]-)ms", 1, true) or data:match("[=<]([%d%s%.]-)ms TTL", 1, true) or "65535" | ||
| timeval = data:match("= [^/]+/([^/]+)/", 1, true) or data:match("[=<]([%d%s%.]-)ms TTL", 1, true) or "65535" |
There was a problem hiding this comment.
你确定这样 匹配能过么？lua 不支持正则的哦。。/ ... / 这两是啥？
而且 mac 下 ping， = 号后面是没空格的哦。time=28.503 ms
PING www.a.shifen.com (180.101.50.242): 56 data bytes
64 bytes from 180.101.50.242: icmp_seq=0 ttl=49 time=28.503 ms
64 bytes from 180.101.50.242: icmp_seq=1 ttl=49 time=30.137 msThere was a problem hiding this comment.
ping结束后最后会输出一行
??? min/avg/max/???? = 26.916/28.208/29.500/1.292 ms
这样的东西，我在上面写了。
这个等于号是 ???? = 这里的等于号，后面是略过第一个/前的内容（匹配平均时长）
There was a problem hiding this comment.
我当然知道lua不支持正则（
这个模式在我的linux上是work的
pinging the host(github.com) ... 91 ms
There was a problem hiding this comment.
win的模式是or后面那个，我试过是可以的，没有动。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Due to i18n reasons,
time=should not be used in patterns.I modified the pattern to match the average time and now it works fine.
There is a slight difference between the macOS and linux ping command outputs, which is reflected in the
?area, so I won't match them.