J Logan
9d870451e8
- Closes #51. Again. - No real notable API changes. The largest change code-wise is in Vminitd. The connection loop is set up immediately in the new API by calling runConnections() on the client, and this blocks until either the task it's running on is cancelled or beginGracefulShutdown is called. Because of this, either we'd have to modify our API to have VirtualMachineAgent implementations call some run() method, or we just put runConnections in an internal task on Vminitd. This change uses the latter approach as it's simpler. - Updated dependencies to pick up latest protobuf and grpc-swift-2 fixes. - ClientBootstrap.withConnectedSocket(fd).wait() registers the vsock fd with epoll/kqueue immediately. vminitd sends its HTTP/2 SETTINGS frame right away upon accepting the connection, so those bytes can arrive on the fd — and be read by NIO — before the gRPC pipeline is installed. With a bare pipeline, NIO has nowhere to send the bytes and discards them. - Buffer until ClientConnectionHandler is in the pipeline so it can process the SETTINGS frame and fire .ready, then schedule delivery of the buffered data with assumeIsolatedUnsafeUnchecked().execute. - To help produce more accurate merged logs, defines a `StderrLogHandler` in the vminitd Application.swift that writes timestamps to the boot log with millisecond precision and format identical to that of the log files created using the `--log-root` arg on `container`. - Updates hawkeye to latest version (v6.5.1). - In vminitd, use the Server event loop group for the gRPC server. Co-authored-by: Danny Canter <danny_canter@apple.com>
56 lines
2.0 KiB
Makefile
56 lines
2.0 KiB
Makefile
# Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# https://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
LOCAL_DIR := $(ROOT_DIR)/.local
|
|
LOCAL_BIN_DIR := $(LOCAL_DIR)/bin
|
|
|
|
# Versions
|
|
PROTOC_VERSION := 26.1
|
|
|
|
# Protoc binary installation
|
|
PROTOC_ZIP := protoc-$(PROTOC_VERSION)-osx-universal_binary.zip
|
|
PROTOC := $(LOCAL_BIN_DIR)/protoc@$(PROTOC_VERSION)/protoc
|
|
$(PROTOC):
|
|
@echo Downloading protocol buffers...
|
|
@mkdir -p $(LOCAL_DIR)
|
|
@curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/$(PROTOC_ZIP)
|
|
@mkdir -p $(dir $@)
|
|
@unzip -jo $(PROTOC_ZIP) bin/protoc -d $(dir $@)
|
|
@unzip -o $(PROTOC_ZIP) 'include/*' -d $(dir $@)
|
|
@rm -f $(PROTOC_ZIP)
|
|
|
|
.PHONY: protoc-gen-swift
|
|
protoc-gen-swift:
|
|
@$(SWIFT) build --product protoc-gen-swift
|
|
@$(SWIFT) build --product protoc-gen-grpc-swift-2
|
|
|
|
.PHONY: protos
|
|
protos: $(PROTOC) protoc-gen-swift
|
|
@echo Generating protocol buffers source code...
|
|
@$(PROTOC) Sources/Containerization/SandboxContext/SandboxContext.proto \
|
|
--plugin=protoc-gen-grpc-swift=$(BUILD_BIN_DIR)/protoc-gen-grpc-swift-2 \
|
|
--plugin=protoc-gen-swift=$(BUILD_BIN_DIR)/protoc-gen-swift \
|
|
--proto_path=Sources/Containerization/SandboxContext \
|
|
--grpc-swift_out="Sources/Containerization/SandboxContext" \
|
|
--grpc-swift_opt=Visibility=Public \
|
|
--swift_out="Sources/Containerization/SandboxContext" \
|
|
--swift_opt=Visibility=Public \
|
|
-I.
|
|
@"$(MAKE)" update-licenses
|
|
|
|
.PHONY: clean-proto-tools
|
|
clean-proto-tools:
|
|
@echo Cleaning proto tools...
|
|
@rm -rf $(LOCAL_DIR)/bin/protoc*
|