admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-06 17:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Allow to compile on windows (#41617)

Browse Source 
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 <julien.salleyron@gmail.com>
This commit is contained in:
Julien Salleyron 2025-05-14 05:33:40 +02:00 committed by GitHub
parent 841f02cf0e
commit 9b8a8f7607
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/hardware/mem_info.go
View File

@ -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

38
pkg/util/hardware/mem_info_windows.go Normal file
View File

@ -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
}