Rename virtsock_stress to sock_stress

A subsequent commit will add support for additional address
families (TCP and TCP6 to start with) so sock_stress is more
appropriate.

Also rename the source files to more appropriate names.

Signed-off-by: Rolf Neugebauer <[email protected]>

Author: rn

Dockerfile.linuxkit

@@ -1,3 +1,3 @@
 FROM scratch
 COPY ./c/build/* /usr/bin/
-COPY ./bin/virtsock_stress.linux /usr/bin/virtsock_stress
+COPY ./bin/sock_stress.linux /usr/bin/sock_stress

Makefile

@@ -1,5 +1,5 @@
-.PHONY: build-in-container build-binaries virtsock_stress clean
-DEPS:=$(wildcard pkg/*.go) $(wildcard cmd/virtsock_stress/*.go) $(wildcard cmd/vsudd/*.go) Dockerfile.build Makefile
+.PHONY: build-in-container build-binaries sock_stress clean
+DEPS:=$(wildcard pkg/*.go) $(wildcard cmd/sock_stress/*.go) $(wildcard cmd/vsudd/*.go) Dockerfile.build Makefile
 
 build-in-container: $(DEPS) clean
 	@echo "+ $@"
@@ -8,8 +8,8 @@ build-in-container: $(DEPS) clean
 		-v ${CURDIR}/bin:/go/src/github.com/linuxkit/virtsock/bin \
 		virtsock-build
 
-build-binaries: vsudd virtsock_stress
-virtsock_stress: bin/virtsock_stress.darwin bin/virtsock_stress.linux bin/virtsock_stress.exe
+build-binaries: vsudd sock_stress
+sock_stress: bin/sock_stress.darwin bin/sock_stress.linux bin/sock_stress.exe
 vsudd: bin/vsudd.linux 
 
 bin/vsudd.linux: $(DEPS)
@@ -18,22 +18,22 @@ bin/vsudd.linux: $(DEPS)
 	go build -o $@ -buildmode pie --ldflags '-s -w -extldflags "-static"' \
 		cmd/vsudd/main.go cmd/vsudd/vsyslog.go
 
-bin/virtsock_stress.linux: $(DEPS)
+bin/sock_stress.linux: $(DEPS)
 	@echo "+ $@"
 	GOOS=linux GOARCH=amd64 \
 	go build -o $@ -buildmode pie --ldflags '-s -w -extldflags "-static"' \
-		cmd/virtsock_stress/virtsock_stress.go cmd/virtsock_stress/common_hvsock.go cmd/virtsock_stress/common_vsock.go cmd/virtsock_stress/common_linux.go
+		cmd/sock_stress/main.go cmd/sock_stress/hvsock.go cmd/sock_stress/vsock.go cmd/sock_stress/sock_linux.go
 
-bin/virtsock_stress.darwin: $(DEPS)
+bin/sock_stress.darwin: $(DEPS)
 	@echo "+ $@"
 	GOOS=darwin GOARCH=amd64 \
 	go build -o $@ --ldflags '-extldflags "-fno-PIC"' \
-		cmd/virtsock_stress/virtsock_stress.go cmd/virtsock_stress/common_vsock.go cmd/virtsock_stress/common_darwin.go
+		cmd/sock_stress/main.go cmd/sock_stress/vsock.go cmd/sock_stress/vsock_darwin.go
 
-bin/virtsock_stress.exe: $(DEPS)
+bin/sock_stress.exe: $(DEPS)
 	@echo "+ $@"
 	GOOS=windows GOARCH=amd64 \
-	go build -o $@ cmd/virtsock_stress/virtsock_stress.go cmd/virtsock_stress/common_hvsock.go cmd/virtsock_stress/common_windows.go
+	go build -o $@ cmd/sock_stress/main.go cmd/sock_stress/hvsock.go cmd/sock_stress/hvsock_windows.go
 
 # Target to build a bootable EFI ISO and kernel+initrd
 linuxkit: build-in-container Dockerfile.linuxkit hvtest.yml

README.md

@@ -5,7 +5,7 @@ This repository contains Go bindings and sample code for [Hyper-V sockets](https
 
 - `pkg/hvsock`: Go binding for Hyper-V sockets
 - `pkg/vsock`: Go binding for virtio VSOCK
-- `cmd/virtsock_stress`: A stress test program for virtsock
+- `cmd/sock_stress`: A stress test program for virtsock
 - `cmd/vsudd`: A unix domain socket to virtsock proxy (used in Docker for Mac/Windows)
 - `scripts`: Miscellaneous scripts
 - `c`: Sample C code (including benchmarks and stress tests)
@@ -36,14 +36,14 @@ This should create a directory called `./hvtest-state`.
 
 Run the server in the VM and client on the host:
 ```
-linux$ virtsock_stress -s -v 1
-macos$ ./bin/virtsock_stress.darwin -c 3 -m hyperkit:./hvtest-state -v 1
+linux$ sock_stress -s -v 1
+macos$ ./bin/sock_stress.darwin -c 3 -m hyperkit:./hvtest-state -v 1
 ```
 
 Run the server on the host and the client inside the VM:
 ```
-macos$ ./bin/virtsock_stress.darwin -s -m hyperkit:./hvtest-state -v 1
-linux$ virtsock_stress -c 2 -v 1
+macos$ ./bin/sock_stress.darwin -s -m hyperkit:./hvtest-state -v 1
+linux$ sock_stress -c 2 -v 1
 ```
 
 ### Windows

cmd/virtsock_stress/README.md renamed to cmd/sock_stress/README.md

@@ -14,8 +14,8 @@ container:
     $ cat >Dockerfile <<EOF
     FROM alpine
     RUN apk update && apk add strace
-    ADD virtsock_stress.linux /virtsock_stress
-    ENTRYPOINT ["/virtsock_stress"]
+    ADD sock_stress.linux /sock_stress
+    ENTRYPOINT ["/sock_stress"]
     EOF
     $ docker build -t stress . && docker run -it --rm --net=host --privileged stress [...options...]
 
@@ -28,7 +28,7 @@ themselves differ).
 To run against standalone Hyperkit the path to the sockets must be
 specified when starting Hyperkit and must be passed to the option:
 
-    macos$ ./virtsock_stress.darwin -s -m hyperkit:/var/run/
+    macos$ ./sock_stress.darwin -s -m hyperkit:/var/run/
 
 (this assumes hyperkit was built without `PRI_ADDR_PREFIX` or
 `CONNECT_SOCKET_NAME` set at build time and run with e.g. `-s
@@ -37,7 +37,7 @@ specified when starting Hyperkit and must be passed to the option:
 In Docker mode everything is implied to be as it is configured by
 Docker for Mac. This is the default but can be given explicitly with:
 
-    macos$ ./virtsock_stress.darwin -s -m docker
+    macos$ ./sock_stress.darwin -s -m docker
 
 # Specific OS Pairs
 
@@ -50,7 +50,7 @@ Start the linux container with program in server mode:
 The start the client in a separate powershell window:
 
     PS> $vmId = (Get-VM MobyLinuxVM).Id
-    PS> .\virtsock_stress.exe -c $vmId
+    PS> .\sock_stress.exe -c $vmId
 
 
 ## Linux & Docker for Mac
@@ -59,10 +59,10 @@ When running as a client on the Linux side the correct address is cid
 "2" (the host):
 
     linux$ docker run -it --rm --net=host --privileged stress -c 2
-    macos$ ./virtsock_stress.darwin -s
+    macos$ ./sock_stress.darwin -s
 
 When running as a client on the MacOS side the correct address is cid
 is "3" (the guest, as configued by Docker for Mac):
 
     linux$ docker run -it --rm --net=host --privileged stress -s
-    macos$ ./virtsock_stress.darwin -c 3
+    macos$ ./sock_stress.darwin -c 3