libxl: add xlu_cfg_get_type function
PATCH 2/5 libxl: add xlu_cfg_get_type function
As cpuid= can be used with two syntaxes (one as a list, the other as a string), we need to distinguish them without an error message. Introduce a helper function to detect the type of entry used before issuing a warning.
Signature · 3 lines
Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 448-3567-12
Quoted 1 line
From
d7f48fb3caac4b2fc99e9db1a8d82b17bdf4391dMon Sep 17 00:00:00 2001
From: Andre Przywara <[email protected]>
Date: Wed, 1 Sep 2010 14:11:54 +0200
Subject: [PATCH 2/5] libxl: add xlu_cfg_get_type function
cpuid= can be used with two syntaxes, one as a list, the other as a string. Introduce a helper function to detect the type of entry used before issuing a warning.
--- tools/libxl/libxlu_cfg.c | 18 ++++++++++++++++++ tools/libxl/libxlutil.h | 6 ++++++ 2 files changed, 24 insertions(+), 0 deletions(-)
tools/libxl/libxlu_cfg.c +18 -0
@@ -124,6 +124,24 @@ static XLU_ConfigSetting *find(const XLU_Config *cfg, const char *n) {return 0 ; } +int xlu_cfg_get_type (const XLU_Config *cfg,const char *n) +{ +XLU_ConfigSetting *set; +char *endptr; +long l; + + set =find (cfg, n); +if (set ==NULL ) +return XLU_CFG_NOTFOUND ; +if (set->avalues >1 ) +return XLU_CFG_LIST ; + errno =0 ; + l =strtol (set->values[0 ], &endptr,0 ); +if (errno ==EINVAL || endptr == set->values[0 ]) +return XLU_CFG_STRING ; +return XLU_CFG_LONG ; +} +static int find_atom (const XLU_Config *cfg,const char *n,XLU_ConfigSetting **set_r) {XLU_ConfigSetting *set;
tools/libxl/libxlutil.h +6 -0
@@ -24,6 +24,11 @@typedef struct XLU_Config XLU_Config ;typedef struct XLU_ConfigList XLU_ConfigList ; +#define XLU_CFG_NOTFOUND 0 +#define XLU_CFG_LIST 1 +#define XLU_CFG_LONG 2 +#define XLU_CFG_STRING 3 +XLU_Config *xlu_cfg_init (FILE *report,const char *report_filename);/* 0 means we got ENOMEM. */ /* report_filename is copied; report is saved and must remain valid
@@ -45,6 +50,7 @@ void xlu_cfg_destroy(XLU_Config*);* ERANGE value out of range (from strtol) */ +int xlu_cfg_get_type (const XLU_Config *cfg,const char *n);int xlu_cfg_get_string (const XLU_Config *,const char *n,const char **value_r);int xlu_cfg_replace_string (const XLU_Config *cfg,const char *n,char **value_r);/* free/strdup version */ int xlu_cfg_get_long (const XLU_Config *,const char *n,long *value_r);
Signature · 1 line
1.6.4
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Andre Przywara writes ("[Xen-devel] [PATCH 2/5] libxl: add xlu_cfg_get_type function"):
Quoted 3 lines
As cpuid= can be used with two syntaxes (one as a list, the other as a string), we need to distinguish them without an error message. Introduce a helper function to detect the type of entry used before issuing a warning.
Thanks. This is a generally good idea although I'm not quite convinced by this:
+ errno = 0; + l = strtol(set->values[0], &endptr, 0); + if (errno == EINVAL || endptr == set->values[0])
+ return XLU_CFG_STRING;
+ return XLU_CFG_LONG;
Firstly, it will fail for unsigned longs bigger than LONG_MAX, and we would normally think about unsigned longs. Secondly, if callers say things like
if (type == XLU_CFG_STRING) ....
they'll have a bug.
I would suggest XLU_CFG_ATOM. Callers can use strto[u]l (or whatever) themselves if they need to distinguish numbers from strings.
Ian.
Quoted 8 lines · Ian Jackson
Andre Przywara writes ("[Xen-devel] [PATCH 2/5] libxl: add
xlu_cfg_get_typefunction"):Quoted 3 lines
As cpuid= can be used with two syntaxes (one as a list, the other as a string), we need to distinguish them without an error message. Introduce a helper function to detect the type of entry used before issuing a warning.
Thanks. This is a generally good idea although I'm not quite convinced by this:
Quoted 8 lines
+ errno = 0; + l = strtol(set->values[0], &endptr, 0); + if (errno == EINVAL || endptr == set->values[0])+ return
XLU_CFG_STRING;
+ returnXLU_CFG_LONG;Firstly, it will fail for unsigned longs bigger than
LONG_MAX, and we would normally think about unsigned longs.
But there is only xlu_cfg_get_long, which returns signed values (used 28 times in xl_cmdimpl.c). I don't see any usage of strtoul in xl_cmdimpl.c which is preceded by xlu_cfg_get_string().
Quoted 5 lines
Secondly, if callers say things like
if (type ==XLU_CFG_STRING) ....
they'll have a bug.
I would suggestXLU_CFG_ATOM. Callers can use strto[u]l (or whatever) themselves if they need to distinguish numbers from strings.
Makes sense. Do you mean like the attached delta patch?
I could also live with making the reporting of the error in libxl_cfg_get_list() optional, so that users aren't bothered with a confusing error output everytime. That would make the whole function obsolete.
Tell me what you like more.
Regards,
Andre.
Signature · 3 lines
Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 448-3567-12
tools/libxl/libxlu_cfg.c +1 -7
@@ -127,19 +127,13 @@ static XLU_ConfigSetting *find(const XLU_Config *cfg, const char *n) {int xlu_cfg_get_type (const XLU_Config *cfg,const char *n) {XLU_ConfigSetting *set; -char *endptr; -long l; set =find (cfg, n);if (set ==NULL )return XLU_CFG_NOTFOUND ;if (set->avalues >1 )return XLU_CFG_LIST ; - errno =0 ; - l =strtol (set->values[0 ], &endptr,0 ); -if (errno ==EINVAL || endptr == set->values[0 ]) -return XLU_CFG_STRING ; -return XLU_CFG_LONG ; +return XLU_CFG_ATOM ; } static int find_atom(const XLU_Config *cfg, const char *n,
tools/libxl/libxlutil.h +1 -2
@@ -26,8 +26,7 @@ typedef struct XLU_ConfigList XLU_ConfigList;#define XLU_CFG_NOTFOUND 0#define XLU_CFG_LIST 1 -#define XLU_CFG_LONG 2 -#define XLU_CFG_STRING 3 +#define XLU_CFG_ATOM 2XLU_Config *xlu_cfg_init (FILE *report,const char *report_filename);/* 0 means we got ENOMEM. */
tools/libxl/xl_cmdimpl.c +1 -1
@@ -1046,7 +1046,7 @@ skip_vfb: } }break ; -case XLU_CFG_STRING : +case XLU_CFG_ATOM :if (!xlu_cfg_get_string (config,"cpuid" , &buf)) {char *buf2, *p, *errstr, *strtok_ptr;
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Andre Przywara writes ("Re: [Xen-devel] [PATCH 2/5] libxl: add xlu_cfg_get_type function"):
Quoted 3 lines
But there is only
xlu_cfg_get_long, which returns signed values (used 28 times inxl_cmdimpl.c). I don't see any usage of strtoul inxl_cmdimpl.cwhich is preceded byxlu_cfg_get_string().
That's true, although it may not remain so forever. But my other arguments stand I think.
Quoted 7 lines
Quoted 5 lines
Secondly, if callers say things like
if (type ==XLU_CFG_STRING) ....
they'll have a bug.
I would suggestXLU_CFG_ATOM. Callers can use strto[u]l (or whatever) themselves if they need to distinguish numbers from strings.Makes sense. Do you mean like the attached delta patch?
Right, yes, that seems sensible.
Quoted 4 lines
I could also live with making the reporting of the error in
libxl_cfg_get_list()optional, so that users aren't bothered with a confusing error output everytime. That would make the whole function obsolete.
That would be fine too.
Quoted 1 line
Tell me what you like more.
My usual rule is "do whatever makes the code smaller". I guess in this case that probably means have the error reporting flag on libxl_cfg_get_list.
Ian.