Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
0d5ca32e
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0d5ca32e
编写于
12月 12, 2016
作者:
N
Nikolay Shirokovskiy
提交者:
Maxim Nestratov
1月 30, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vz: provide block stats for all domain stats
上级
9c10c030
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
200 addition
and
0 deletion
+200
-0
src/vz/vz_driver.c
src/vz/vz_driver.c
+192
-0
src/vz/vz_sdk.c
src/vz/vz_sdk.c
+8
-0
未找到文件。
src/vz/vz_driver.c
浏览文件 @
0d5ca32e
...
@@ -3515,6 +3515,197 @@ vzDomainGetJobStats(virDomainPtr domain,
...
@@ -3515,6 +3515,197 @@ vzDomainGetJobStats(virDomainPtr domain,
return
ret
;
return
ret
;
}
}
#define VZ_ADD_STAT_PARAM_UUL(group, field, counter) \
do { \
if (stat.field != -1) { \
snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \
group ".%zu." counter, i); \
if (virTypedParamsAddULLong(&record->params, \
&record->nparams, \
maxparams, \
param_name, \
stat.field) < 0) \
return -1; \
} \
} while (0)
static
int
vzDomainGetBlockStats
(
virDomainObjPtr
dom
,
virDomainStatsRecordPtr
record
,
int
*
maxparams
)
{
vzDomObjPtr
privdom
=
dom
->
privateData
;
size_t
i
;
char
param_name
[
VIR_TYPED_PARAM_FIELD_LENGTH
];
if
(
virTypedParamsAddUInt
(
&
record
->
params
,
&
record
->
nparams
,
maxparams
,
"block.count"
,
dom
->
def
->
ndisks
)
<
0
)
return
-
1
;
for
(
i
=
0
;
i
<
dom
->
def
->
ndisks
;
i
++
)
{
virDomainBlockStatsStruct
stat
;
virDomainDiskDefPtr
disk
=
dom
->
def
->
disks
[
i
];
if
(
prlsdkGetBlockStats
(
privdom
->
stats
,
disk
,
&
stat
,
IS_CT
(
dom
->
def
))
<
0
)
return
-
1
;
snprintf
(
param_name
,
VIR_TYPED_PARAM_FIELD_LENGTH
,
"block.%zu.name"
,
i
);
if
(
virTypedParamsAddString
(
&
record
->
params
,
&
record
->
nparams
,
maxparams
,
param_name
,
disk
->
dst
)
<
0
)
return
-
1
;
if
(
virStorageSourceIsLocalStorage
(
disk
->
src
)
&&
disk
->
src
->
path
)
{
snprintf
(
param_name
,
VIR_TYPED_PARAM_FIELD_LENGTH
,
"block.%zu.path"
,
i
);
if
(
virTypedParamsAddString
(
&
record
->
params
,
&
record
->
nparams
,
maxparams
,
param_name
,
disk
->
src
->
path
)
<
0
)
return
-
1
;
}
VZ_ADD_STAT_PARAM_UUL
(
"block"
,
rd_req
,
"rd.reqs"
);
VZ_ADD_STAT_PARAM_UUL
(
"block"
,
rd_bytes
,
"rd.bytes"
);
VZ_ADD_STAT_PARAM_UUL
(
"block"
,
wr_req
,
"wr.reqs"
);
VZ_ADD_STAT_PARAM_UUL
(
"block"
,
wr_bytes
,
"wr.bytes"
);
if
(
disk
->
device
==
VIR_DOMAIN_DISK_DEVICE_DISK
)
{
snprintf
(
param_name
,
VIR_TYPED_PARAM_FIELD_LENGTH
,
"block.%zu.capacity"
,
i
);
if
(
virTypedParamsAddULLong
(
&
record
->
params
,
&
record
->
nparams
,
maxparams
,
param_name
,
disk
->
src
->
capacity
)
<
0
)
return
-
1
;
}
}
return
0
;
}
static
virDomainStatsRecordPtr
vzDomainGetAllStats
(
virConnectPtr
conn
,
virDomainObjPtr
dom
)
{
virDomainStatsRecordPtr
stat
;
int
maxparams
=
0
;
if
(
VIR_ALLOC
(
stat
)
<
0
)
return
NULL
;
if
(
vzDomainGetBlockStats
(
dom
,
stat
,
&
maxparams
)
<
0
)
goto
error
;
if
(
!
(
stat
->
dom
=
virGetDomain
(
conn
,
dom
->
def
->
name
,
dom
->
def
->
uuid
)))
goto
error
;
return
stat
;
error:
virTypedParamsFree
(
stat
->
params
,
stat
->
nparams
);
virObjectUnref
(
stat
->
dom
);
VIR_FREE
(
stat
);
return
NULL
;
}
static
int
vzConnectGetAllDomainStats
(
virConnectPtr
conn
,
virDomainPtr
*
domains
,
unsigned
int
ndomains
,
unsigned
int
stats
,
virDomainStatsRecordPtr
**
retStats
,
unsigned
int
flags
)
{
vzConnPtr
privconn
=
conn
->
privateData
;
vzDriverPtr
driver
=
privconn
->
driver
;
unsigned
int
lflags
=
flags
&
(
VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE
|
VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT
|
VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE
);
unsigned
int
supported
=
VIR_DOMAIN_STATS_STATE
|
VIR_DOMAIN_STATS_VCPU
|
VIR_DOMAIN_STATS_INTERFACE
|
VIR_DOMAIN_STATS_BALLOON
|
VIR_DOMAIN_STATS_BLOCK
;
virDomainObjPtr
*
doms
=
NULL
;
size_t
ndoms
;
virDomainStatsRecordPtr
*
tmpstats
=
NULL
;
int
nstats
=
0
;
int
ret
=
-
1
;
size_t
i
;
virCheckFlags
(
VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE
|
VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT
|
VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE
|
VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS
,
-
1
);
if
(
virConnectGetAllDomainStatsEnsureACL
(
conn
)
<
0
)
return
-
1
;
if
(
!
stats
)
{
stats
=
supported
;
}
else
if
((
flags
&
VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS
)
&&
(
stats
&
~
supported
))
{
virReportError
(
VIR_ERR_ARGUMENT_UNSUPPORTED
,
_
(
"Stats types bits 0x%x are not supported by this daemon"
),
stats
&
~
supported
);
return
-
1
;
}
if
(
ndomains
)
{
if
(
virDomainObjListConvert
(
driver
->
domains
,
conn
,
domains
,
ndomains
,
&
doms
,
&
ndoms
,
virConnectGetAllDomainStatsCheckACL
,
lflags
,
true
)
<
0
)
return
-
1
;
}
else
{
if
(
virDomainObjListCollect
(
driver
->
domains
,
conn
,
&
doms
,
&
ndoms
,
virConnectGetAllDomainStatsCheckACL
,
lflags
)
<
0
)
return
-
1
;
}
if
(
VIR_ALLOC_N
(
tmpstats
,
ndoms
+
1
)
<
0
)
goto
cleanup
;
for
(
i
=
0
;
i
<
ndoms
;
i
++
)
{
virDomainStatsRecordPtr
tmp
;
virDomainObjPtr
dom
=
doms
[
i
];
virObjectLock
(
dom
);
tmp
=
vzDomainGetAllStats
(
conn
,
dom
);
virObjectUnlock
(
dom
);
if
(
!
tmp
)
goto
cleanup
;
tmpstats
[
nstats
++
]
=
tmp
;
}
*
retStats
=
tmpstats
;
tmpstats
=
NULL
;
ret
=
nstats
;
cleanup:
virDomainStatsRecordListFree
(
tmpstats
);
virObjectListFreeCount
(
doms
,
ndoms
);
return
ret
;
}
#undef VZ_ADD_STAT_PARAM_UUL
static
virHypervisorDriver
vzHypervisorDriver
=
{
static
virHypervisorDriver
vzHypervisorDriver
=
{
.
name
=
"vz"
,
.
name
=
"vz"
,
.
connectOpen
=
vzConnectOpen
,
/* 0.10.0 */
.
connectOpen
=
vzConnectOpen
,
/* 0.10.0 */
...
@@ -3610,6 +3801,7 @@ static virHypervisorDriver vzHypervisorDriver = {
...
@@ -3610,6 +3801,7 @@ static virHypervisorDriver vzHypervisorDriver = {
.
domainUpdateDeviceFlags
=
vzDomainUpdateDeviceFlags
,
/* 2.0.0 */
.
domainUpdateDeviceFlags
=
vzDomainUpdateDeviceFlags
,
/* 2.0.0 */
.
domainGetJobInfo
=
vzDomainGetJobInfo
,
/* 2.2.0 */
.
domainGetJobInfo
=
vzDomainGetJobInfo
,
/* 2.2.0 */
.
domainGetJobStats
=
vzDomainGetJobStats
,
/* 2.2.0 */
.
domainGetJobStats
=
vzDomainGetJobStats
,
/* 2.2.0 */
.
connectGetAllDomainStats
=
vzConnectGetAllDomainStats
,
/* 3.1.0 */
};
};
static
virConnectDriver
vzConnectDriver
=
{
static
virConnectDriver
vzConnectDriver
=
{
...
...
src/vz/vz_sdk.c
浏览文件 @
0d5ca32e
...
@@ -596,6 +596,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
...
@@ -596,6 +596,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
char
*
buf
=
NULL
;
char
*
buf
=
NULL
;
PRL_RESULT
pret
;
PRL_RESULT
pret
;
PRL_UINT32
emulatedType
;
PRL_UINT32
emulatedType
;
PRL_UINT32
size
;
virDomainDeviceDriveAddressPtr
address
;
virDomainDeviceDriveAddressPtr
address
;
int
busIdx
,
devIdx
;
int
busIdx
,
devIdx
;
int
ret
=
-
1
;
int
ret
=
-
1
;
...
@@ -654,6 +655,13 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
...
@@ -654,6 +655,13 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
if
(
virDomainDiskSetDriver
(
disk
,
"vz"
)
<
0
)
if
(
virDomainDiskSetDriver
(
disk
,
"vz"
)
<
0
)
goto
cleanup
;
goto
cleanup
;
if
(
disk
->
device
==
VIR_DOMAIN_DISK_DEVICE_DISK
)
{
pret
=
PrlVmDevHd_GetDiskSize
(
prldisk
,
&
size
);
prlsdkCheckRetGoto
(
pret
,
cleanup
);
/* from MiB to bytes */
disk
->
src
->
capacity
=
((
unsigned
long
long
)
size
)
<<
20
;
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录