shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-08-05 16:21:59 +03:00
Code Issues Projects Releases Activity

Use static variables to store virPyDictToTypedParams hints

Browse Source 
There is no need to have dynamic allocation every time the API
is called.  Rewrites commit <314b2346df>.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina
2018-02-19 14:46:54 +01:00
parent 314b2346df
commit 920be92397
2 changed files with 34 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
libvirt-override.c
View File

@ -7739,6 +7739,25 @@ libvirt_virDomainMigrateGetMaxDowntime(PyObject *self ATTRIBUTE_UNUSED,
#endif /* LIBVIR_CHECK_VERSION(3, 7, 0) */ #endif /* LIBVIR_CHECK_VERSION(3, 7, 0) */
#if LIBVIR_CHECK_VERSION(1, 1, 0) #if LIBVIR_CHECK_VERSION(1, 1, 0)
static virPyTypedParamsHint virPyDomainMigrate3Params[] = {
{ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG },
{ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_DISKS_PORT, VIR_TYPED_PARAM_INT },
{ VIR_MIGRATE_PARAM_COMPRESSION, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS, VIR_TYPED_PARAM_INT },
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL, VIR_TYPED_PARAM_INT },
{ VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS, VIR_TYPED_PARAM_INT },
{ VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE, VIR_TYPED_PARAM_ULLONG },
{ VIR_MIGRATE_PARAM_PERSIST_XML, VIR_TYPED_PARAM_STRING },
{ VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL, VIR_TYPED_PARAM_INT },
{ VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT, VIR_TYPED_PARAM_INT },
};
static PyObject * static PyObject *
libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED, libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
PyObject *args) PyObject *args)
@ -7750,9 +7769,7 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
PyObject *dict; PyObject *dict;
unsigned int flags; unsigned int flags;
virTypedParameterPtr params; virTypedParameterPtr params;
virPyTypedParamsHintPtr hparams;
int nparams = 0; int nparams = 0;
int nhparams = 15;
virDomainPtr ddom = NULL; virDomainPtr ddom = NULL;
if (!PyArg_ParseTuple(args, (char *) "OOOI:virDomainMigrate3", if (!PyArg_ParseTuple(args, (char *) "OOOI:virDomainMigrate3",
@ -7762,55 +7779,9 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
dconn = (virConnectPtr) PyvirConnect_Get(pyobj_dconn); dconn = (virConnectPtr) PyvirConnect_Get(pyobj_dconn);
hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams);
hparams[0].name = VIR_MIGRATE_PARAM_URI;
hparams[0].type = VIR_TYPED_PARAM_STRING;
hparams[1].name = VIR_MIGRATE_PARAM_DEST_NAME;
hparams[1].type = VIR_TYPED_PARAM_STRING;
hparams[2].name = VIR_MIGRATE_PARAM_DEST_XML;
hparams[2].type = VIR_TYPED_PARAM_STRING;
hparams[3].name = VIR_MIGRATE_PARAM_GRAPHICS_URI;
hparams[3].type = VIR_TYPED_PARAM_STRING;
hparams[4].name = VIR_MIGRATE_PARAM_BANDWIDTH;
hparams[4].type = VIR_TYPED_PARAM_ULLONG;
hparams[5].name = VIR_MIGRATE_PARAM_LISTEN_ADDRESS;
hparams[5].type = VIR_TYPED_PARAM_STRING;
hparams[6].name = VIR_MIGRATE_PARAM_DISKS_PORT;
hparams[6].type = VIR_TYPED_PARAM_INT;
hparams[7].name = VIR_MIGRATE_PARAM_COMPRESSION;
hparams[7].type = VIR_TYPED_PARAM_STRING;
hparams[8].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS;
hparams[8].type = VIR_TYPED_PARAM_INT;
hparams[9].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL;
hparams[9].type = VIR_TYPED_PARAM_INT;
hparams[10].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS;
hparams[10].type = VIR_TYPED_PARAM_INT;
hparams[11].name = VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE;
hparams[11].type = VIR_TYPED_PARAM_ULLONG;
hparams[12].name = VIR_MIGRATE_PARAM_PERSIST_XML;
hparams[12].type = VIR_TYPED_PARAM_STRING;
hparams[13].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL;
hparams[13].type = VIR_TYPED_PARAM_INT;
hparams[14].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT;
hparams[14].type = VIR_TYPED_PARAM_INT;
if (virPyDictToTypedParams(dict, &params, &nparams, if (virPyDictToTypedParams(dict, &params, &nparams,
hparams, nhparams) < 0) { virPyDomainMigrate3Params,
free(hparams); VIR_N_ELEMENTS(virPyDomainMigrate3Params)) < 0) {
return NULL; return NULL;
} }
@ -7819,7 +7790,6 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
LIBVIRT_END_ALLOW_THREADS; LIBVIRT_END_ALLOW_THREADS;
virTypedParamsFree(params, nparams); virTypedParamsFree(params, nparams);
free(hparams);
return libvirt_virDomainPtrWrap(ddom); return libvirt_virDomainPtrWrap(ddom);
} }
@ -7833,9 +7803,7 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED,
PyObject *dict; PyObject *dict;
unsigned int flags; unsigned int flags;
virTypedParameterPtr params; virTypedParameterPtr params;
virPyTypedParamsHintPtr hparams;
int nparams; int nparams;
int nhparams = 15;
int ret = -1; int ret = -1;
if (!PyArg_ParseTuple(args, (char *) "OzOI:virDomainMigrate3", if (!PyArg_ParseTuple(args, (char *) "OzOI:virDomainMigrate3",
@ -7844,55 +7812,9 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED,
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams);
hparams[0].name = VIR_MIGRATE_PARAM_URI;
hparams[0].type = VIR_TYPED_PARAM_STRING;
hparams[1].name = VIR_MIGRATE_PARAM_DEST_NAME;
hparams[1].type = VIR_TYPED_PARAM_STRING;
hparams[2].name = VIR_MIGRATE_PARAM_DEST_XML;
hparams[2].type = VIR_TYPED_PARAM_STRING;
hparams[3].name = VIR_MIGRATE_PARAM_GRAPHICS_URI;
hparams[3].type = VIR_TYPED_PARAM_STRING;
hparams[4].name = VIR_MIGRATE_PARAM_BANDWIDTH;
hparams[4].type = VIR_TYPED_PARAM_ULLONG;
hparams[5].name = VIR_MIGRATE_PARAM_LISTEN_ADDRESS;
hparams[5].type = VIR_TYPED_PARAM_STRING;
hparams[6].name = VIR_MIGRATE_PARAM_DISKS_PORT;
hparams[6].type = VIR_TYPED_PARAM_INT;
hparams[7].name = VIR_MIGRATE_PARAM_COMPRESSION;
hparams[7].type = VIR_TYPED_PARAM_STRING;
hparams[8].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS;
hparams[8].type = VIR_TYPED_PARAM_INT;
hparams[9].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL;
hparams[9].type = VIR_TYPED_PARAM_INT;
hparams[10].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS;
hparams[10].type = VIR_TYPED_PARAM_INT;
hparams[11].name = VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE;
hparams[11].type = VIR_TYPED_PARAM_ULLONG;
hparams[12].name = VIR_MIGRATE_PARAM_PERSIST_XML;
hparams[12].type = VIR_TYPED_PARAM_STRING;
hparams[13].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL;
hparams[13].type = VIR_TYPED_PARAM_INT;
hparams[14].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT;
hparams[14].type = VIR_TYPED_PARAM_INT;
if (virPyDictToTypedParams(dict, &params, &nparams, if (virPyDictToTypedParams(dict, &params, &nparams,
hparams, nhparams) < 0) { virPyDomainMigrate3Params,
free(hparams); VIR_N_ELEMENTS(virPyDomainMigrate3Params)) < 0) {
return NULL; return NULL;
} }
@ -7901,7 +7823,6 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED,
LIBVIRT_END_ALLOW_THREADS; LIBVIRT_END_ALLOW_THREADS;
virTypedParamsFree(params, nparams); virTypedParamsFree(params, nparams);
free(hparams);
return libvirt_intWrap(ret); return libvirt_intWrap(ret);
} }
#endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ #endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */
@ -8743,6 +8664,13 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED,
} }
static virPyTypedParamsHint virPyDomainBlockCopyParams[] = {
{ VIR_DOMAIN_BLOCK_COPY_BANDWIDTH, VIR_TYPED_PARAM_ULLONG },
{ VIR_DOMAIN_BLOCK_COPY_GRANULARITY, VIR_TYPED_PARAM_UINT },
{ VIR_DOMAIN_BLOCK_COPY_BUF_SIZE, VIR_TYPED_PARAM_UINT },
};
static PyObject * static PyObject *
libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED,
PyObject *args) PyObject *args)
@ -8754,9 +8682,7 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED,
char *disk = NULL; char *disk = NULL;
char *destxml = NULL; char *destxml = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
virPyTypedParamsHintPtr hparams;
int nparams = 0; int nparams = 0;
int nhparams = 3;
unsigned int flags = 0; unsigned int flags = 0;
int c_retval; int c_retval;
@ -8765,22 +8691,11 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED,
return NULL; return NULL;
if (PyDict_Check(pyobj_dict)) { if (PyDict_Check(pyobj_dict)) {
hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams);
hparams[0].name = VIR_DOMAIN_BLOCK_COPY_BANDWIDTH;
hparams[0].type = VIR_TYPED_PARAM_ULLONG;
hparams[1].name = VIR_DOMAIN_BLOCK_COPY_GRANULARITY;
hparams[1].type = VIR_TYPED_PARAM_UINT;
hparams[2].name = VIR_DOMAIN_BLOCK_COPY_BUF_SIZE;
hparams[2].type = VIR_TYPED_PARAM_UINT;
if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, if (virPyDictToTypedParams(pyobj_dict, &params, &nparams,
hparams, nhparams) < 0) { virPyDomainBlockCopyParams,
free(hparams); VIR_N_ELEMENTS(virPyDomainBlockCopyParams)) < 0) {
return NULL; return NULL;
} }
free(hparams);
} }
dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom);

2
libvirt-utils.h
View File

@ -146,6 +146,8 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
# endif # endif
#define VIR_N_ELEMENTS(array) (sizeof(array) / sizeof(*(array)))
/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" /* The two-statement sequence "Py_INCREF(Py_None); return Py_None;"
is so common that we encapsulate it here. Now, each use is simply is so common that we encapsulate it here. Now, each use is simply
return VIR_PY_NONE; */ return VIR_PY_NONE; */