From 9b8a8f7607ef371da8e41ebd480892a80c4ea550 Mon Sep 17 00:00:00 2001 From: Julien Salleyron Date: Wed, 14 May 2025 05:33:40 +0200 Subject: [PATCH] fix: Allow to compile on windows (#41617) This PR fixes https://github.com/milvus-io/milvus/issues/41384 on 2.5. Related to #41448. When using milvus client and compile on windows, the compilation failed with the undefined RSS error. On windows, the way to get memory used is the same as on darwin. Signed-off-by: Julien Salleyron --- pkg/util/hardware/mem_info.go | 4 +-- pkg/util/hardware/mem_info_windows.go | 38 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 pkg/util/hardware/mem_info_windows.go diff --git a/pkg/util/hardware/mem_info.go b/pkg/util/hardware/mem_info.go index 5548574222..502dfd7791 100644 --- a/pkg/util/hardware/mem_info.go +++ b/pkg/util/hardware/mem_info.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !darwin && !openbsd && !freebsd -// +build !darwin,!openbsd,!freebsd +//go:build !darwin && !openbsd && !freebsd && !windows +// +build !darwin,!openbsd,!freebsd,!windows package hardware diff --git a/pkg/util/hardware/mem_info_windows.go b/pkg/util/hardware/mem_info_windows.go new file mode 100644 index 0000000000..67dfde3899 --- /dev/null +++ b/pkg/util/hardware/mem_info_windows.go @@ -0,0 +1,38 @@ +// Copyright (C) 2019-2020 Zilliz. All rights reserved. +// +// 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 +// +// http://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. + +//go:build windows +// +build windows + +package hardware + +import ( + "github.com/shirou/gopsutil/v3/mem" + "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/v2/log" +) + +// GetUsedMemoryCount returns the memory usage in bytes. +func GetUsedMemoryCount() uint64 { + // not in container, calculate by `gopsutil` + stats, err := mem.VirtualMemory() + if err != nil { + log.Warn("failed to get memory usage count", + zap.Error(err)) + return 0 + } + + return stats.Used +}