apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-22 07:29:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix uint64 to float64 conversion

Browse Source
This commit is contained in:
Ingo Oppermann
2024-11-05 21:47:03 +01:00
parent 0d57a855f4
commit 74607db85b
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/docs.go
View File

@@ -7413,8 +7413,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"avg": {
"type": "integer",
"format": "uint64"
"type": "number"
},
"cur": {
"type": "integer",
@@ -7451,8 +7450,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"avg": {
"type": "integer",
"format": "uint64"
"type": "number"
},
"cur": {
"type": "integer",

6
docs/swagger.json
View File

@@ -7406,8 +7406,7 @@
"type": "object",
"properties": {
"avg": {
"type": "integer",
"format": "uint64"
"type": "number"
},
"cur": {
"type": "integer",
@@ -7444,8 +7443,7 @@
"type": "object",
"properties": {
"avg": {
"type": "integer",
"format": "uint64"
"type": "number"
},
"cur": {
"type": "integer",

6
docs/swagger.yaml
View File

@@ -1586,8 +1586,7 @@ definitions:
api.ProcessUsageGPUMemory:
properties:
avg:
format: uint64
type: integer
type: number
cur:
format: uint64
type: integer
@@ -1612,8 +1611,7 @@ definitions:
api.ProcessUsageMemory:
properties:
avg:
format: uint64
type: integer
type: number
cur:
format: uint64
type: integer

18
http/api/process.go
View File

@@ -432,14 +432,14 @@ func (p *ProcessUsageCPU) Marshal() app.ProcessUsageCPU {
type ProcessUsageMemory struct {
Current uint64 `json:"cur" format:"uint64"`
Average uint64 `json:"avg" format:"uint64"`
Average json.Number `json:"avg" swaggertype:"number" jsonschema:"type=number"`
Max uint64 `json:"max" format:"uint64"`
Limit uint64 `json:"limit" format:"uint64"`
}
func (p *ProcessUsageMemory) Unmarshal(pp *app.ProcessUsageMemory) {
p.Current = pp.Current
p.Average = pp.Average
p.Average = json.ToNumber(float64(pp.Average))
p.Max = pp.Max
p.Limit = pp.Limit
}
@@ -447,24 +447,27 @@ func (p *ProcessUsageMemory) Unmarshal(pp *app.ProcessUsageMemory) {
func (p *ProcessUsageMemory) Marshal() app.ProcessUsageMemory {
pp := app.ProcessUsageMemory{
Current: p.Current,
Average: p.Average,
Max: p.Max,
Limit: p.Limit,
}
if x, err := p.Average.Float64(); err == nil {
pp.Average = uint64(x)
}
return pp
}
type ProcessUsageGPUMemory struct {
Current uint64 `json:"cur" format:"uint64"`
Average uint64 `json:"avg" format:"uint64"`
Average json.Number `json:"avg" swaggertype:"number" jsonschema:"type=number"`
Max uint64 `json:"max" format:"uint64"`
Limit uint64 `json:"limit" format:"uint64"`
}
func (p *ProcessUsageGPUMemory) Unmarshal(pp *app.ProcessUsageGPUMemory) {
p.Current = pp.Current
p.Average = pp.Average
p.Average = json.ToNumber(float64(pp.Average))
p.Max = pp.Max
p.Limit = pp.Limit
}
@@ -472,11 +475,14 @@ func (p *ProcessUsageGPUMemory) Unmarshal(pp *app.ProcessUsageGPUMemory) {
func (p *ProcessUsageGPUMemory) Marshal() app.ProcessUsageGPUMemory {
pp := app.ProcessUsageGPUMemory{
Current: p.Current,
Average: p.Average,
Max: p.Max,
Limit: p.Limit,
}
if x, err := p.Average.Float64(); err == nil {
pp.Average = uint64(x)
}
return pp
}