mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

ci: add race detector flag to hyperbole & fix a race condition in UDPTunnel

Browse source
This commit is contained in:
Toby 2023-10-05 14:22:17 -07:00
parent 6f1807a376
commit f8482a3ddb
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/internal/forwarding/udp.go
View file

@ -75,12 +75,13 @@ type UDPEventLogger interface {
}
func (t *UDPTunnel) Serve(pc net.PacketConn) error {
t.m = make(map[string]*sessionEntry)
stopCh := make(chan struct{})
go t.idleCleanupLoop(stopCh)
defer close(stopCh)
defer t.cleanup(false)
t.m = make(map[string]*sessionEntry)
buf := make([]byte, udpBufferSize)
for {
n, addr, err := pc.ReadFrom(buf)

20
hyperbole.py
View file

@ -169,7 +169,7 @@ def get_app_platforms():
return result
def cmd_build(pprof=False, release=False):
def cmd_build(pprof=False, release=False, race=False):
if not check_build_env():
return
@ -228,7 +228,7 @@ def cmd_build(pprof=False, release=False):
print("Unsupported arch for android: %s" % arch)
return
else:
env["CGO_ENABLED"] = "0"
env["CGO_ENABLED"] = "1" if race else "0" # Race detector requires cgo
plat_ldflags = ldflags.copy()
plat_ldflags.append("-X")
@ -247,6 +247,8 @@ def cmd_build(pprof=False, release=False):
if pprof:
cmd.append("-tags")
cmd.append("pprof")
if race:
cmd.append("-race")
if release:
cmd.append("-trimpath")
cmd.append(APP_SRC_DIR)
@ -260,7 +262,7 @@ def cmd_build(pprof=False, release=False):
print("Built %s" % out_name)
def cmd_run(args, pprof=False):
def cmd_run(args, pprof=False, race=False):
if not check_build_env():
return
@ -289,6 +291,8 @@ def cmd_run(args, pprof=False):
if pprof:
cmd.append("-tags")
cmd.append("pprof")
if race:
cmd.append("-race")
cmd.append(APP_SRC_DIR)
cmd.extend(args)
@ -415,6 +419,9 @@ def main():
p_run.add_argument(
"-p", "--pprof", action="store_true", help="Run with pprof enabled"
)
p_run.add_argument(
"-d", "--race", action="store_true", help="Build with data race detection"
)
p_run.add_argument("args", nargs=argparse.REMAINDER)
# Build
@ -425,6 +432,9 @@ def main():
p_build.add_argument(
"-r", "--release", action="store_true", help="Build a release version"
)
p_build.add_argument(
"-d", "--race", action="store_true", help="Build with data race detection"
)
# Format
p_cmd.add_parser("format", help="Format the code")
@ -454,9 +464,9 @@ def main():
args = parser.parse_args()
if args.command == "run":
cmd_run(args.args, args.pprof)
cmd_run(args.args, args.pprof, args.race)
elif args.command == "build":
cmd_build(args.pprof, args.release)
cmd_build(args.pprof, args.release, args.race)
elif args.command == "format":
cmd_format()
elif args.command == "mockgen":