refactor(vendor): user smux in depends to replace pkg in vendor. #1000193713

Signed-off-by: Victor1319 <zengxuewei@oppo.com>
This commit is contained in:
Victor1319 2025-06-25 14:45:17 +08:00 committed by zhumingze1108
parent 83c019a1a0
commit 809d023e9e
20 changed files with 56 additions and 50 deletions

View File

@ -45,7 +45,7 @@ import (
"github.com/cubefs/cubefs/util/log"
"github.com/cubefs/cubefs/util/strutil"
"github.com/xtaci/smux"
"github.com/cubefs/cubefs/depends/xtaci/smux"
)
var (

View File

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -23,7 +23,7 @@ import (
"sync/atomic"
"time"
"github.com/xtaci/smux"
"github.com/cubefs/cubefs/depends/xtaci/smux"
"github.com/cubefs/cubefs/cmd/common"
"github.com/cubefs/cubefs/proto"

View File

@ -20,7 +20,7 @@ import (
"net"
"strings"
"github.com/xtaci/smux"
"github.com/cubefs/cubefs/depends/xtaci/smux"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/util"

View File

@ -26,8 +26,8 @@ import (
"time"
"unsafe"
"github.com/cubefs/cubefs/depends/xtaci/smux"
"github.com/cubefs/cubefs/util/errors"
"github.com/xtaci/smux"
)
const (

View File

@ -13,7 +13,7 @@ import (
"testing"
"time"
"github.com/xtaci/smux"
"github.com/cubefs/cubefs/depends/xtaci/smux"
)
func init() {

View File

@ -1,24 +0,0 @@
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a
*.so
# Folders
_obj
_test
# Architecture specific extensions/prefixes
*.[568vq]
[568vq].out
*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*
_testmain.go
*.exe
*.test
*.prof

View File

@ -1,20 +0,0 @@
arch:
- amd64
- ppc64le
language: go
go:
- 1.9.x
- 1.10.x
- 1.11.x
before_install:
- go get -t -v ./...
install:
- go get github.com/xtaci/smux
script:
- go test -coverprofile=coverage.txt -covermode=atomic -bench .
after_success:
- bash <(curl -s https://codecov.io/bash)

51
vendor/golang.org/x/net/http2/Dockerfile generated vendored Normal file
View File

@ -0,0 +1,51 @@
#
# This Dockerfile builds a recent curl with HTTP/2 client support, using
# a recent nghttp2 build.
#
# See the Makefile for how to tag it. If Docker and that image is found, the
# Go tests use this curl binary for integration tests.
#
FROM ubuntu:trusty
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y git-core build-essential wget
RUN apt-get install -y --no-install-recommends \
autotools-dev libtool pkg-config zlib1g-dev \
libcunit1-dev libssl-dev libxml2-dev libevent-dev \
automake autoconf
# The list of packages nghttp2 recommends for h2load:
RUN apt-get install -y --no-install-recommends make binutils \
autoconf automake autotools-dev \
libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \
libev-dev libevent-dev libjansson-dev libjemalloc-dev \
cython python3.4-dev python-setuptools
# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached:
ENV NGHTTP2_VER 895da9a
RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git
WORKDIR /root/nghttp2
RUN git reset --hard $NGHTTP2_VER
RUN autoreconf -i
RUN automake
RUN autoconf
RUN ./configure
RUN make
RUN make install
WORKDIR /root
RUN wget https://curl.se/download/curl-7.45.0.tar.gz
RUN tar -zxvf curl-7.45.0.tar.gz
WORKDIR /root/curl-7.45.0
RUN ./configure --with-ssl --with-nghttp2=/usr/local
RUN make
RUN make install
RUN ldconfig
CMD ["-h"]
ENTRYPOINT ["/usr/local/bin/curl"]

1
vendor/modules.txt vendored
View File

@ -398,7 +398,6 @@ github.com/tklauser/go-sysconf
github.com/tklauser/numcpus
# github.com/xtaci/smux v1.5.16
## explicit; go 1.13
github.com/xtaci/smux
# github.com/yusufpapurcu/wmi v1.2.3
## explicit; go 1.16
github.com/yusufpapurcu/wmi