External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of whitespae in preprocessor macros for API generator

Browse Source 
The apibuild.py script did not handle whitespace in preprocessor
macros, so it failed to detect constants declared with '# define'
instead of '#define'. Since we now correctly indent our public
header files, we have silently lost all constants from
libvirt-api.xml. This also caused us to not detect formatting
errors in constant docs
This commit is contained in:
Daniel P. Berrange 2014-12-04 12:06:32 +00:00
parent 3ecebf0711
commit 64702ac367
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/apibuild.py
View File

@ -459,6 +459,14 @@ class CLexer:
if line[0] == '#': if line[0] == '#':
self.tokens = map((lambda x: ('preproc', x)), self.tokens = map((lambda x: ('preproc', x)),
string.split(line)) string.split(line))
# We might have whitespace between the '#' and preproc
# macro name, so instead of having a single token element
# of '#define' we might end up with '#' and 'define'. This
# merges them back together
if self.tokens[0][1] == "#":
self.tokens[0] = ('preproc', self.tokens[0][1] + self.tokens[1][1])
self.tokens = self.tokens[:1] + self.tokens[2:]
break break
l = len(line) l = len(line)
if line[0] == '"' or line[0] == "'": if line[0] == '"' or line[0] == "'":

12
include/libvirt/libvirt-host.h
View File

@ -536,28 +536,32 @@ struct _virNodeMemoryStats {
*/ */
# define VIR_NODE_MEMORY_SHARED_PAGES_SHARING "shm_pages_sharing" # define VIR_NODE_MEMORY_SHARED_PAGES_SHARING "shm_pages_sharing"
/* VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED: /*
* VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED:
* *
* Macro for typed parameter that represents how many pages unique * Macro for typed parameter that represents how many pages unique
* but repeatedly checked for merging. * but repeatedly checked for merging.
*/ */
# define VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED "shm_pages_unshared" # define VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED "shm_pages_unshared"
/* VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE: /*
* VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE:
* *
* Macro for typed parameter that represents how many pages changing * Macro for typed parameter that represents how many pages changing
* too fast to be placed in a tree. * too fast to be placed in a tree.
*/ */
# define VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE "shm_pages_volatile" # define VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE "shm_pages_volatile"
/* VIR_NODE_MEMORY_SHARED_FULL_SCAN: /*
* VIR_NODE_MEMORY_SHARED_FULL_SCANS:
* *
* Macro for typed parameter that represents how many times all * Macro for typed parameter that represents how many times all
* mergeable areas have been scanned. * mergeable areas have been scanned.
*/ */
# define VIR_NODE_MEMORY_SHARED_FULL_SCANS "shm_full_scans" # define VIR_NODE_MEMORY_SHARED_FULL_SCANS "shm_full_scans"
/* VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES: /*
* VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES:
* *
* Macro for typed parameter that represents whether pages from * Macro for typed parameter that represents whether pages from
* different NUMA nodes can be merged. The parameter has type int, * different NUMA nodes can be merged. The parameter has type int,