# global variable to keep track of serializers and switch data types
# due to weird dependencies, I see no way to do this more elegant at the moment
finished_serializers = []
+finished_sizeof = []
finished_switch = []
def _h(fmt, *args):
self.c_reply_type = _t(name + ('reply',))
self.c_cookie_type = _t(name + ('cookie',))
+ self.need_aux = False
+ self.need_serialize = False
+ self.need_sizeof = False
+
self.c_aux_name = _n(name + ('aux',))
self.c_aux_checked_name = _n(name + ('aux', 'checked'))
self.c_aux_unchecked_name = _n(name + ('aux', 'unchecked'))
self.c_serialize_name = _n(name + ('serialize',))
self.c_unserialize_name = _n(name + ('unserialize',))
- if hasattr(self, 'reply'):
- if self.reply is not None:
- self.c_serialize_name = _n(name + ('reply', 'serialize'))
- self.c_unserialize_name = _n(name + ('reply', 'unserialize'))
- # indicates rare structs where variable size fields are followed fixed size fields
+ self.c_unpack_name = _n(name + ('unpack',))
+ self.c_sizeof_name = _n(name + ('sizeof',))
+
+ # special case: structs where variable size fields are followed by fixed size fields
self.var_followed_by_fixed_fields = False
- # whether a request or reply has a switch field
- self.need_aux = False
- self.need_serialize = False
+ # whether a request or reply has a switch field
if self.is_switch:
self.need_serialize = True
self.c_container = 'struct'
_c_type_setup(field.type, field.field_type, ())
if field.type.is_list:
_c_type_setup(field.type.member, field.field_type, ())
- # FIXME - structures with variable sized members, sort out when serialize() is needed
- if (field.type.nmemb is None): # and not field.type.member.fixed_size():
- self.need_serialize = True
+ if (field.type.nmemb is None):
+# if field.type.member.need_serialize:
+# self.need_serialize = True
+ self.need_sizeof = True
field.c_field_type = _t(field.field_type)
field.c_field_const_type = ('' if field.type.nmemb == 1 else 'const ') + field.c_field_type
field.c_field_name = _cpp(field.field_name)
field.c_subscript = '[%d]' % field.type.nmemb if (field.type.nmemb > 1) else ''
field.c_pointer = ' ' if field.type.nmemb == 1 else '*'
+
+ # correct the c_pointer field for variable size non-list types
+ if not field.type.fixed_size() and field.c_pointer == ' ':
+ field.c_pointer = '*'
+ if field.type.is_list and not field.type.member.fixed_size():
+ field.c_pointer = '*'
+
if field.type.is_switch:
field.c_pointer = '*'
field.c_field_const_type = 'const ' + field.c_field_type
self.need_aux = True
elif not field.type.fixed_size() and not field.type.is_bitcase:
- self.need_serialize = True
+ #self.need_serialize = True
+ self.need_sizeof = True
field.c_iterator_type = _t(field.field_type + ('iterator',)) # xcb_fieldtype_iterator_t
field.c_iterator_name = _n(name + (field.field_name, 'iterator')) # xcb_container_field_iterator
field.c_accessor_name = _n(name + (field.field_name,)) # xcb_container_field
field.c_length_name = _n(name + (field.field_name, 'length')) # xcb_container_field_length
- # special case - c_field_name ends with _length as well
- #if field.c_field_name.endswith('length'):
- # c_field_name = field.c_field_name.rsplit('length', 1)
- # field.c_field_name = c_field_name[0] + "_length"
+
field.c_end_name = _n(name + (field.field_name, 'end')) # xcb_container_field_end
field.prev_varsized_field = prev_varsized_field
if field.type.fixed_size():
prev_varsized_offset += field.type.size
+ # special case: intermixed fixed and variable size fields
if prev_varsized_field is not None and not field.type.is_pad and field.wire:
if not self.is_union:
self.need_serialize = True
self.var_followed_by_fixed_fields = True
-# print "WARNING (%s): variable size field %s followed by fixed size field %s" % (
-# self.c_type, prev_varsized_field.field_name, field.field_name)
else:
self.last_varsized_field = field
prev_varsized_field = field
prev_varsized_offset = 0
+ if self.var_followed_by_fixed_fields:
+ if field.type.fixed_size():
+ field.prev_varsized_field = None
+
+ if self.need_serialize:
+ # when _unserialize() is wanted, create _sizeof() as well for consistency reasons
+ self.need_sizeof = True
+
# as switch does never appear at toplevel,
# continue here with type construction
if self.is_switch:
finished_switch.append(self.c_type)
# special: switch C structs get pointer fields for variable-sized members
_c_complex(self)
- # FIXME: declare switch (un)packing functions
- _c_accessors(self, name, name)
-
- # FIXME - in case of request/reply, serialize() is not always needed
- if self.need_serialize and not self.is_bitcase:
- if self.c_serialize_name not in finished_serializers:
- finished_serializers.append(self.c_serialize_name)
- _c_serialize(self)
- _c_unserialize(self)
+ # FIXME: what about accessors & switch (un)packing functions
+ # _c_iterator() does not seem to be the right place to do it,
+ # as the accessors would need any parameters to pass to _unpack() as well
+
+ if not self.is_bitcase:
+ if self.need_serialize:
+ if self.c_serialize_name not in finished_serializers:
+ finished_serializers.append(self.c_serialize_name)
+ _c_serialize(self)
+ # _unpack() and _unserialize() are only needed for special cases
+ if self.is_switch or self.var_followed_by_fixed_fields:
+ _c_unserialize(self)
+ if self.need_sizeof:
+ if self.c_sizeof_name not in finished_sizeof:
+ finished_sizeof.append(self.c_sizeof_name)
+ _c_sizeof_helper(self)
# _c_type_setup()
def get_request_fields(self):
if e not in all_fields:
unresolved.append(e)
return unresolved
+# resolve_fields()
def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'):
def add_param(params, param):
params = []
if 'serialize' == context:
params.append(('void', '**', buffer_var))
- elif 'unserialize' == context:
+ elif context in ('unserialize', 'unpack', 'sizeof'):
params.append(('const void', '*', buffer_var))
# look for special cases
# aux argument - structure to be serialized
if 'serialize' == context:
add_param(params, ('const %s' % self.c_type, '*', aux_var))
- elif 'unserialize' == context and self.is_switch:
+ elif 'unserialize' == context:
+ add_param(params, ('%s' % self.c_type, '**', aux_var))
+ elif 'unpack' == context:
add_param(params, ('%s' % self.c_type, '*', aux_var))
+
if not self.is_switch and 'serialize' == context:
for p in param_fields:
if not p.type.fixed_size():
return (param_fields, wire_fields, params)
# get_serialize_params()
-def _c_serialize_helper_prefix(prefix):
+def _c_serialize_helper_prefix(prefix, aux_var='_aux', aux_sep='->'):
# prefix is a list of (field_name, anchestor object) tuples
# concatenate field names
prefix_str = ''
- for name, obj in prefix:
+ for name, sep, obj in prefix:
prefix_str += name
- prefix_str += '.' if (obj.is_bitcase and obj.has_name) else '->'
- lenfield_prefix = '' if prefix_str.find('_aux')==0 else "_aux"
+ if sep == '':
+ sep = '.' if (obj.is_bitcase and obj.has_name) else '->'
+ prefix_str += sep
+
+ lenfield_prefix = '' if prefix_str.find(aux_var)==0 else aux_var
+
if prefix_str != '':
if lenfield_prefix != '':
- lenfield_prefix += '->'
+ lenfield_prefix += aux_sep
lenfield_prefix += prefix_str
return (prefix_str, lenfield_prefix)
# _c_serialize_helper_prefix
fname = "%s%s" % (prefix_str, f.c_field_name)
if fields.has_key(f.field_name):
- continue
- # FIXME
raise Exception("field name %s has been registered before" % f.field_name)
fields[f.field_name] = (fname, f)
if f.type.is_container:
- get_field_name(fields, f.type, prefix+[(f.c_field_name, f.type)])
+ get_field_name(fields, f.type, prefix+[(f.c_field_name, '', f.type)])
# get_field_name()
# dict(field_name : (c_field_name, field))
code_lines.append('%s xcb_parts[xcb_parts_idx].iov_base = xcb_pad0;' % space)
code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = xcb_pad;' % space)
code_lines.append('%s xcb_parts_idx++;' % space)
- elif 'unserialize' == context:
+ elif context in ('unserialize', 'unpack', 'sizeof'):
code_lines.append('%s xcb_tmp += xcb_pad;' % space)
code_lines.append('%s xcb_buffer_len += xcb_pad;' % space)
code_lines, temp_vars,
space, prefix):
count = 0
- switch_prefix = prefix + [(complex_name, self)]
+ switch_prefix = prefix + [(complex_name, '->', self)]
prefix_str, lenfield_prefix = _c_serialize_helper_prefix(switch_prefix)
switch_expr = _c_accessor_get_expr(self.expr)
for b in self.bitcases:
bitcase_expr = _c_accessor_get_expr(b.type.expr, prefix_str)
code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr))
+ code_lines.append(' printf("entering bitcase section for %%%%d...\\n", %s);' % bitcase_expr)
b_prefix = switch_prefix
if b.type.has_name:
- b_prefix = switch_prefix + [(b.c_field_name, b.type)]
- _c_serialize_helper_fields(context, b.type,
- code_lines, temp_vars,
- "%s " % space,
- b_prefix,
- is_bitcase = True)
+ b_prefix = switch_prefix + [(b.c_field_name, '.', b.type)]
+ count += _c_serialize_helper_fields(context, b.type,
+ code_lines, temp_vars,
+ "%s " % space,
+ b_prefix,
+ is_bitcase = True)
code_lines.append(' }')
if 'serialize' == context:
- count = _c_serialize_helper_insert_padding(context, code_lines, space)
- if 'unserialize' == context:
+ count += _c_serialize_helper_insert_padding(context, code_lines, space)
+ if context in ('unserialize', 'unpack', 'sizeof'):
# padding
code_lines.append('%s xcb_pad = -xcb_block_len & 3;' % space)
code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space)
param_fields, wire_fields, params = get_serialize_params(context, self)
args = get_expr_fields(field.type)
field_mapping = _c_field_mapping(context, self, prefix)
+ prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix)
# determine which params to pass to _unserialize() and their prefixes
switch_len_fields = resolve_fields(self, field.type)
c_field_names += "%s, " % field_mapping[a.c_field_name][0]
for a in args:
c_field_names += "%s, " % field_mapping[a.c_field_name][0]
-# switch_field_name = field_mapping[field.field_name][0]
- # call _unserialize() to determine the actual size
- length = "%s(xcb_tmp, %s&%s)" % (field.type.c_unserialize_name,
- c_field_names, c_switch_variable) #switch_field_name)
+
+ # call _serialize()/_unpack() to determine the actual size
+ if 'serialize' == context:
+ length = "%s(&%s, %s&%s%s)" % (field.type.c_serialize_name, c_switch_variable,
+ c_field_names, prefix_str, field.c_field_name)
+ elif context in ('unserialize', 'unpack'):
+ length = "%s(xcb_tmp, %s&%s%s)" % (field.type.c_unpack_name,
+ c_field_names, prefix_str, field.c_field_name)
return length
# _c_serialize_helper_switch_field()
"""
expr = field.type.expr
prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix)
- param_fields, wire_fields, params = get_serialize_params('unserialize', self)
+ param_fields, wire_fields, params = get_serialize_params('sizeof', self)
param_names = [p[2] for p in params]
# look if the list's lenfield is a struct member or a function argument
# so no need for a prefix
lenfield_prefix = ''
sep = '.' if (self.is_bitcase and self.has_name) else '->'
- list_length = _c_accessor_get_expr(expr, lenfield_prefix, sep)
+
+ # special case: unserializing of structs where variable and
+ # fixed size fields are intermixed
+ if self.var_followed_by_fixed_fields and 'unserialize' == context:
+ if lenfield_prefix == '_aux':
+ lenfield_prefix = 'xcb_out'
+ sep = '.'
+ list_length = _c_accessor_get_expr(expr, lenfield_prefix, sep)
+
# default: list with fixed size elements
length = '%s * sizeof(%s)' % (list_length, field.type.member.c_wiretype)
# list with variable-sized elements
- if field.type.size is None:
+ if not field.type.member.fixed_size():
length = ''
- if 'unserialize' == context:
+ if context in ('unserialize', 'sizeof', 'unpack'):
int_i = ' unsigned int i;'
xcb_tmp_len = ' unsigned int xcb_tmp_len;'
if int_i not in temp_vars:
temp_vars.append(xcb_tmp_len)
code_lines.append("%s for(i=0; i<%s; i++) {" % (space, list_length))
code_lines.append("%s xcb_tmp_len = %s(xcb_tmp);" %
- (space, field.type.c_unserialize_name))
+ (space, field.type.c_sizeof_name))
code_lines.append("%s xcb_block_len += xcb_tmp_len;" % space)
code_lines.append("%s xcb_tmp += xcb_tmp_len;" % space)
code_lines.append("%s }" % space)
code_lines.append('%s xcb_tmp = (char *) %s%s;' % (space, prefix_str, field.c_field_name))
code_lines.append('%s for(i=0; i<%s; i++) { '
% (space, _c_accessor_get_expr(expr, lenfield_prefix, sep)))
- code_lines.append('%s xcb_block_len = %s(xcb_tmp);' % (space, field.type.c_unserialize_name))
+ code_lines.append('%s xcb_block_len = %s(xcb_tmp);' % (space, field.type.c_sizeof_name))
code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len += xcb_block_len;' % space)
code_lines.append('%s }' % space)
code_lines.append('%s xcb_block_len = xcb_parts[xcb_parts_idx].iov_len;' % space)
def _c_serialize_helper_fields_fixed_size(context, self, field,
code_lines, temp_vars,
space, prefix):
- code_lines.append('%s /* %s.%s */' % (space, self.c_type, field.c_field_name))
+ if not self.is_bitcase:
+ code_lines.append('%s /* %s.%s */' % (space, self.c_type, field.c_field_name))
+ else:
+ scoped_name = [p[2].c_type if idx==0 else p[0] for idx, p in enumerate(prefix)]
+ typename = reduce(lambda x,y: "%s.%s" % (x, y), scoped_name)
+ code_lines.append('%s /* %s.%s */' % (space, typename, field.c_field_name))
prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix)
length = "sizeof(%s)" % field.c_field_type
- if 'unserialize' == context:
+ if context in ('unserialize', 'unpack', 'sizeof'):
value = ' %s%s = *(%s *)xcb_tmp;' % (prefix_str, field.c_field_name, field.c_field_type)
if field.type.is_pad and field.type.nmemb > 1:
value = ''
code_lines.append('%s %s%s[%d] = *(%s *)xcb_tmp;' %
(space, prefix_str, field.c_field_name, i, field.c_field_type))
length += " * %d" % field.type.nmemb
- # FIXME? - lists
+
if field.type.is_list:
raise Exception('list with fixed number of elemens unhandled in _unserialize()')
elif 'serialize' == context:
space, prefix):
prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix)
- if 'unserialize' == context:
+ if context in ('unserialize', 'unpack', 'sizeof'):
value = ''
+ var_field_name = 'xcb_tmp'
+ if self.var_followed_by_fixed_fields and 'unserialize' == context:
+ value = ' %s = xcb_tmp;' % field.c_field_name
+ temp_vars.append(' %s *%s;' % (field.type.c_type, field.c_field_name))
+ if 'unpack' == context:
+ value = ' %s%s = (%s *)xcb_tmp;' % (prefix_str, field.c_field_name, field.c_field_type)
elif 'serialize' == context:
address_of = '&' if (self.is_bitcase and self.has_name) else ''
- value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s%s%s;' % (address_of, prefix_str, field.c_field_name)
+ var_field_name = "%s%s%s" % (address_of, prefix_str, field.c_field_name)
+ value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s;' % var_field_name
length = ''
prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix)
code_lines.append('%s /* %s */' % (space, field.c_field_name))
if field.type.is_list:
+ if value != '':
+ code_lines.append("%s%s" % (space, value))
+ value = ''
length = _c_serialize_helper_list_field(context, self, field,
code_lines, temp_vars,
space, prefix)
elif field.type.is_switch:
- prev = filter(lambda x: x.find('xcb_switch_field'), temp_vars)
- var_name = 'xcb_switch_field%d' % len(prev)
- temp_vars.append(' %s %s;' % (field.type.c_type, var_name))
- length = _c_serialize_helper_switch_field(context, self, field, var_name, prefix)
+ value = ''
+ if context == 'serialize':
+ value = ' xcb_parts[xcb_parts_idx].iov_base = (char *)0;'
+ length = _c_serialize_helper_switch_field(context, self, field, 'xcb_parts[xcb_parts_idx].iov_base', prefix)
else:
- length = "%s(xcb_tmp)" % (field.type.c_unserialize_name)
+ length = "%s(%s)" % (field.type.c_sizeof_name, var_field_name)
return (value, length)
# _c_serialize_helper_fields_variable_size
space, prefix, is_bitcase):
count = 0
need_padding = False
+ prev_field_was_variable = False
for field in self.fields:
if not ((field.wire and not field.auto) or field.visible):
# switch/bitcase: fixed size fields must be considered explicitly
if field.type.fixed_size():
- if self.is_bitcase:
+ if self.is_bitcase or self.var_followed_by_fixed_fields:
+ if prev_field_was_variable and need_padding:
+ # insert padding
+ _c_serialize_helper_insert_padding(context, code_lines, space)
+ prev_field_was_variable = False
+ fixed_prefix = prefix
+ if self.var_followed_by_fixed_fields and len(prefix)==0:
+ if 'unserialize' == context:
+ fixed_prefix = [('xcb_out', '.', self)]
+ else:
+ fixed_prefix = [('_aux', '->', self)]
value, length = _c_serialize_helper_fields_fixed_size(context, self, field,
code_lines, temp_vars,
- space, prefix)
+ space, fixed_prefix)
else:
continue
value, length = _c_serialize_helper_fields_variable_size(context, self, field,
code_lines, temp_vars,
space, prefix)
+
+ prev_field_was_variable = True
# save (un)serialization C code
if '' != value:
- code_lines.append('%s%s' % (space, value))
+ code_lines.append('%s%s' % (space, value))
if field.type.fixed_size() and is_bitcase:
code_lines.append('%s xcb_block_len += %s;' % (space, length))
- if 'unserialize' == context:
+ if context in ('unserialize', 'unpack', 'sizeof'):
code_lines.append('%s xcb_tmp += %s;' % (space, length))
else:
# padding
if '' != length:
code_lines.append('%s xcb_block_len = %s;' % (space, length))
- if 'unserialize' == context:
+ if (not field.type.fixed_size() and
+ self.var_followed_by_fixed_fields and 'unserialize' == context):
+ temp_vars.append(' int %s_len;' % field.c_field_name)
+ code_lines.append(' %s_len = xcb_block_len;' % field.c_field_name)
+ if context in ('unserialize', 'sizeof', 'unpack'):
code_lines.append('%s xcb_tmp += xcb_block_len;' % space)
if 'serialize' == context:
if '' != length:
complex_name = complex_type.name
else:
self = complex_type
- complex_name = '_aux'
-
+ if self.var_followed_by_fixed_fields and 'unserialize' == context:
+ complex_name = 'xcb_out'
+ else:
+ complex_name = '_aux'
+
# special case: switch is serialized by evaluating each bitcase separately
if self.is_switch:
count += _c_serialize_helper_switch(context, self, complex_name,
# all other data types can be evaluated one field a time
else:
# unserialize & fixed size fields: simply cast the buffer to the respective xcb_out type
- if 'unserialize' == context:
+ if context in ('unserialize', 'unpack', 'sizeof') and not self.var_followed_by_fixed_fields:
code_lines.append('%s xcb_block_len += sizeof(%s);' % (space, self.c_type))
code_lines.append('%s xcb_tmp += xcb_block_len;' % space)
_c_serialize_helper_insert_padding(context, code_lines, space)
-
+
count += _c_serialize_helper_fields(context, self,
code_lines, temp_vars,
space, prefix, False)
if variable_size_fields > 0:
code_lines = []
temp_vars = []
- count =_c_serialize_helper('serialize', self,
- code_lines, temp_vars)
+ count = _c_serialize_helper('serialize', self,
+ code_lines, temp_vars)
# update variable size fields
variable_size_fields = count
temp_vars.append(' unsigned int xcb_pad = 0;')
temp_vars.append(' char xcb_pad0[3] = {0, 0, 0};')
- temp_vars.append(' struct iovec xcb_parts[%d];' % (count+1))
+ temp_vars.append(' struct iovec xcb_parts[%d];' % count)
temp_vars.append(' unsigned int xcb_parts_idx = 0;')
temp_vars.append(' unsigned int xcb_block_len = 0;')
temp_vars.append(' unsigned int i;')
variable_size_fields = 0
# maximum space required for type definition of function arguments
maxtypelen = 0
- param_fields, wire_fields, params = get_serialize_params('unserialize', self)
+ if self.is_switch:
+ context = 'unpack'
+ func_name = self.c_unpack_name
+ else:
+ context = 'unserialize'
+ func_name = self.c_unserialize_name
+ param_fields, wire_fields, params = get_serialize_params(context, self)
# determine N(variable_fields)
for field in param_fields:
for idx, p in enumerate(params):
line = ""
typespec, pointerspec, field_name = p
- indent = ' '*(len(self.c_unserialize_name)+2)
+ indent = ' '*(len(func_name)+2)
# p==0: function declaration
if 0==idx:
- line = "%s (" % self.c_unserialize_name
+ line = "%s (" % func_name
indent = ''
spacing = ' '*(maxtypelen-len(typespec)-len(pointerspec))
line += "%s%s%s %s%s /**< */" % (indent, typespec, spacing, pointerspec, field_name)
_c('{')
_c(' char *xcb_tmp = (char *)_buffer;')
if not self.is_switch:
- _c(' const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type)
+ if not self.var_followed_by_fixed_fields:
+ _c(' const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type)
+ else:
+ _c(' %s xcb_out;', self.c_type)
_c(' unsigned int xcb_buffer_len = 0;')
_c(' unsigned int xcb_block_len = 0;')
_c(' unsigned int xcb_pad = 0;')
code_lines = []
temp_vars = []
- _c_serialize_helper('unserialize', self,
+ _c_serialize_helper(context, self,
code_lines, temp_vars)
for t in temp_vars:
_c(t)
for l in code_lines:
_c(l)
_c('')
+
+ if 'unserialize' == context:
+ # allocate memory automatically
+ _c(' if (NULL == *_aux) {')
+ _c(' /* allocate memory */')
+ _c(' *_aux = malloc(xcb_buffer_len);')
+ _c(' }')
+ _c('')
+ _c(' **_aux = xcb_out;')
+ _c(' xcb_tmp = (char *)++(*_aux);')
+ for field in param_fields:
+ if not field.type.fixed_size():
+ _c(' memcpy(xcb_tmp, %s, %s_len);', field.c_field_name, field.c_field_name)
+ _c(' xcb_tmp += %s_len;', field.c_field_name)
+ _c('')
+
_c(' return xcb_buffer_len;')
_c('}')
# _c_unserialize()
+def _c_sizeof_helper(self):
+ _h_setlevel(1)
+ _c_setlevel(1)
+
+ # _unserialize()
+ _hc('')
+ # _unserialize() returns the buffer size as well
+ _hc('int')
+
+ variable_size_fields = 0
+ # maximum space required for type definition of function arguments
+ maxtypelen = 0
+ param_fields, wire_fields, params = get_serialize_params('sizeof', self)
+
+ # determine N(variable_fields)
+ for field in param_fields:
+ # if self.is_switch, treat all fields as if they are variable sized
+ if not field.type.fixed_size() or self.is_switch:
+ variable_size_fields += 1
+ # determine maxtypelen
+ for p in params:
+ maxtypelen = max(maxtypelen, len(p[0]) + len(p[1]))
+
+ # write to .c/.h
+ for idx, p in enumerate(params):
+ line = ""
+ typespec, pointerspec, field_name = p
+ indent = ' '*(len(self.c_sizeof_name)+2)
+ # p==0: function declaration
+ if 0==idx:
+ line = "%s (" % self.c_sizeof_name
+ indent = ''
+ spacing = ' '*(maxtypelen-len(typespec)-len(pointerspec))
+ line += "%s%s%s %s%s /**< */" % (indent, typespec, spacing, pointerspec, field_name)
+ if idx < len(params)-1:
+ _hc("%s," % line)
+ else:
+ _h("%s);" % line)
+ _c("%s)" % line)
+
+ _c('{')
+
+ param_names = [p[2] for p in params]
+ if self.is_switch:
+ # switch: call _unpack()
+ _c(' %s _aux;', self.c_type)
+ _c(' return %s(%s, &_aux);', self.c_unpack_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
+ elif self.var_followed_by_fixed_fields:
+ # special case: call _unserialize()
+ _c(' %s *_aux = NULL;', self.c_type)
+ _c(' return %s(%s, &_aux);', self.c_unserialize_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
+ # otherwise: evaluate parameters directly
+ else:
+ code_lines = []
+ temp_vars = []
+ _c_serialize_helper('sizeof', self,
+ code_lines, temp_vars)
+ _c(' char *xcb_tmp = (char *)_buffer;')
+ if len(filter(lambda x: x.find('_aux')!=-1, code_lines))>0:
+ if not self.var_followed_by_fixed_fields:
+ _c(' const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type)
+ else:
+ _c(' %s *_aux = malloc(sizeof(%s));', self.c_type, self.c_type)
+ _c(' unsigned int xcb_buffer_len = 0;')
+ _c(' unsigned int xcb_block_len = 0;')
+ _c(' unsigned int xcb_pad = 0;')
+ for t in temp_vars:
+ _c(t)
+ _c('')
+
+ for l in code_lines:
+ _c(l)
+ _c('')
+ _c(' return xcb_buffer_len;')
+ _c('}')
+# _c_sizeof_helper()
+
def _c_iterator_get_end(field, accum):
'''
Figures out what C code is needed to find the end of a variable-length structure field.
'''
if field.type.is_container:
accum = field.c_accessor_name + '(' + accum + ')'
- if field.type.fixed_size():
- print "iterator_get_end()", accum, field.c_field_name
# XXX there could be fixed-length fields at the end
return _c_iterator_get_end(field.type.last_varsized_field, accum)
if field.type.is_list:
if not self.fixed_size():
_c(' %s *R = i->data;', self.c_type)
- _c(' xcb_generic_iterator_t child = %s;', _c_iterator_get_end(self.last_varsized_field, 'R'))
- _c(' --i->rem;')
- _c(' i->data = (%s *) child.data;', self.c_type)
- _c(' i->index = child.index;')
+ if self.is_union:
+ # FIXME - how to determine the size of a variable size union??
+ _c(' /* FIXME - determine the size of the union %s */', self.c_type)
+ else:
+ _c(' xcb_generic_iterator_t child = %s;', _c_iterator_get_end(self.last_varsized_field, 'R'))
+ _c(' --i->rem;')
+ _c(' i->data = (%s *) child.data;', self.c_type)
+ _c(' i->index = child.index;')
else:
_c(' --i->rem;')
_c(' ++i->data;')
if expr.lenfield != None and expr.lenfield.prev_varsized_field != None:
# special case: variable and fixed size fields are intermixed
+ # if the lenfield is among the fixed size fields, there is no need
+ # to call a special accessor function!
retval = expr.lenfield.c_accessor_name + '(' + prefix + ')'
- if prefix in ('', '_aux'):
+ if prefix in ('', '_aux', 'xcb_out'):
prefix_str = '' if prefix=='' else '%s' % (prefarrow)
retval = '%s%s' % (prefix_str, expr.lenfield_name)
return retval
prefix += sep
list_name = "%s%s" % (prefix, field.c_field_name)
c_length_func = "%s(%s%s)" % (field.c_length_name, prefix, field.c_field_name)
- # FIXME
+ # FIXME - works only for integers this way!!
c_length_func = _c_accessor_get_expr(field.type.expr, prefix='', sep='')
return 'xcb_sumof(%s, %s)' % (list_name, c_length_func)
elif expr.op != None:
elif expr.bitfield:
return 'xcb_popcount(' + lenexp + ')'
else:
- return lenexp + '/* bla */'
+ return lenexp
def _c_accessors_field(self, field):
'''
_hc(' **')
_hc(' *****************************************************************************/')
_hc(' ')
- _hc('%s *', field.c_field_type)
+ if field.type.is_switch:
+ return_type = 'void *'
+ else:
+ return_type = '%s *' % field.c_field_type
+
+ _hc(return_type)
_h('%s (const %s *R /**< */);', field.c_accessor_name, self.c_type)
_c('%s (const %s *R /**< */)', field.c_accessor_name, self.c_type)
_c('{')
if field.prev_varsized_field is None:
- _c(' return (%s *) (R + 1);', field.c_field_type)
+ _c(' return (%s) (R + 1);', return_type)
+ # note: the special case 'variable fields followed by fixed size fields'
+ # is not of any consequence here, since the ordering gets
+ # 'corrected' in the reply function
else:
_c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R'))
- _c(' return (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);',
- field.c_field_type, field.first_field_after_varsized.type.c_type, field.prev_varsized_offset)
+ _c(' return (%s) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);',
+ return_type, field.first_field_after_varsized.type.c_type, field.prev_varsized_offset)
_c('}')
def _c_accessors_list(self, field):
'''
Declares the accessor functions for the fields of a structure.
'''
- for field in self.fields:
- # no accessors for switch -
- # switch always needs to be unserialized explicitly
- if self.is_switch:
- continue
- if field.type.is_list and not field.type.fixed_size():
- _c_accessors_list(self, field)
- elif field.prev_varsized_field != None or not field.type.fixed_size():
- _c_accessors_field(self, field)
+ # no accessors for switch -
+ # switch always needs to be unpacked explicitly
+ if not self.is_switch:
+ for field in self.fields:
+ if field.type.is_list and not field.type.fixed_size():
+ _c_accessors_list(self, field)
+ elif field.prev_varsized_field is not None or not field.type.fixed_size():
+ _c_accessors_field(self, field)
def c_simple(self, name):
'''
varfield = None
for field in self.fields:
- if not field.type.fixed_size() and not self.is_switch:
+ if not field.type.fixed_size() and not self.is_switch and not self.is_union:
varfield = field.c_field_name
continue
- if varfield != None and not field.type.is_pad and field.wire:
- errmsg = '%s: warning: variable field %s followed by fixed field %s\n' % (self.c_type, varfield, field.c_field_name)
- sys.stderr.write(errmsg)
- # sys.exit(1)
+# if varfield != None and not field.type.is_pad and field.wire:
+# errmsg = '%s: warning: variable field %s followed by fixed field %s\n' % (self.c_type, varfield, field.c_field_name)
+# sys.stderr.write(errmsg)
+# sys.exit(1)
if field.wire:
struct_fields.append(field)
-
+
for field in struct_fields:
length = len(field.c_field_type)
# account for '*' pointer_spec
wire_fields = []
maxtypelen = len('xcb_connection_t')
serial_fields = []
+ # special case: list with variable size elements
+ list_with_var_size_elems = False
for field in self.fields:
if field.visible:
if field.wire and not field.auto:
# We need to set the field up in the structure
wire_fields.append(field)
- if field.type.need_serialize:
+ if field.type.need_serialize or field.type.need_sizeof:
serial_fields.append(field)
for field in param_fields:
c_field_const_type = "const void"
if len(c_field_const_type) > maxtypelen:
maxtypelen = len(c_field_const_type)
+ if field.type.is_list and not field.type.member.fixed_size():
+ list_with_var_size_elems = True
_h_setlevel(1)
_c_setlevel(1)
spacing, c_pointer, field.c_field_name, comma)
count = 2
+ if not self.var_followed_by_fixed_fields:
+ for field in param_fields:
+ if not field.type.fixed_size():
+ count = count + 2
+ if field.type.need_serialize:
+ # _serialize() keeps track of padding automatically
+ count -= 1
+ dimension = count + 2
if self.var_followed_by_fixed_fields:
- count += len(wire_fields)*2
- for field in param_fields:
- if not field.type.fixed_size():
- count = count + 2
- if field.type.need_serialize:
- # _serialize() keeps track of padding automatically
- count -= 1
+ # there will be only one call to _serialize() and no need for additional padding
+ dimension -= 1
_c('{')
_c(' static const xcb_protocol_request_t xcb_req = {')
_c(' };')
_c(' ')
- _c(' struct iovec xcb_parts[%d];', count + 2)
+ _c(' struct iovec xcb_parts[%d];', dimension)
_c(' %s xcb_ret;', func_cookie)
- if not self.var_followed_by_fixed_fields:
- _c(' %s xcb_out;', self.c_type)
+ _c(' %s xcb_out;', self.c_type)
+ if self.var_followed_by_fixed_fields:
+ _c(' /* in the protocol description, variable size fields are followed by fixed size fields */')
+
for idx, f in enumerate(serial_fields):
- if not aux:
- _c(' %s xcb_aux%d;' % (f.type.c_type, idx))
- else:
+ if aux:
_c(' void *xcb_aux%d = 0;' % (idx))
+ if list_with_var_size_elems:
+ _c(' unsigned int i;')
+ _c(' unsigned int xcb_tmp_len;')
+ _c(' char *xcb_tmp;')
_c(' ')
# _c(' printf("in function %s\\n");' % func_name)
# fixed size fields
- if not self.var_followed_by_fixed_fields:
- for field in wire_fields:
- if field.type.fixed_size():
- if field.type.is_expr:
- _c(' xcb_out.%s = %s;', field.c_field_name, _c_accessor_get_expr(field.type.expr))
- elif field.type.is_pad:
- if field.type.nmemb == 1:
- _c(' xcb_out.%s = 0;', field.c_field_name)
- else:
- _c(' memset(xcb_out.%s, 0, %d);', field.c_field_name, field.type.nmemb)
+ for field in wire_fields:
+ if field.type.fixed_size():
+ if field.type.is_expr:
+ _c(' xcb_out.%s = %s;', field.c_field_name, _c_accessor_get_expr(field.type.expr))
+ elif field.type.is_pad:
+ if field.type.nmemb == 1:
+ _c(' xcb_out.%s = 0;', field.c_field_name)
else:
- if field.type.nmemb == 1:
- _c(' xcb_out.%s = %s;', field.c_field_name, field.c_field_name)
- else:
- _c(' memcpy(xcb_out.%s, %s, %d);', field.c_field_name, field.c_field_name, field.type.nmemb)
+ _c(' memset(xcb_out.%s, 0, %d);', field.c_field_name, field.type.nmemb)
+ else:
+ if field.type.nmemb == 1:
+ _c(' xcb_out.%s = %s;', field.c_field_name, field.c_field_name)
+ else:
+ _c(' memcpy(xcb_out.%s, %s, %d);', field.c_field_name, field.c_field_name, field.type.nmemb)
+
+ def get_serialize_args(type_obj, c_field_name, aux_var, context='serialize'):
+ serialize_args = get_serialize_params(context, type_obj,
+ c_field_name,
+ aux_var)[2]
+ return reduce(lambda x,y: "%s, %s" % (x,y), [a[2] for a in serialize_args])
+
+ # calls in order to free dyn. all. memory
+ free_calls = []
+ if not self.var_followed_by_fixed_fields:
_c(' ')
_c(' xcb_parts[2].iov_base = (char *) &xcb_out;')
_c(' xcb_parts[2].iov_len = sizeof(xcb_out);')
_c(' xcb_parts[3].iov_base = 0;')
_c(' xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;')
- # calls in order to free dyn. all. memory
- free_calls = []
- if not self.var_followed_by_fixed_fields:
count = 4
- else:
- count = 2
- var_size_fields = param_fields
- if self.var_followed_by_fixed_fields:
- var_size_fields = wire_fields + param_fields
- for field in var_size_fields:
- if field.type.fixed_size and self.var_followed_by_fixed_fields:
- _c(' xcb_parts[%d].iov_base = (char *) &%s;', count, field.c_field_name)
- _c(' xcb_parts[%d].iov_len = sizeof(%s);', count, field.type.c_type)
- count += 1
- if not field.type.fixed_size():
- # default: simple cast to char *
- if not field.type.need_serialize:
- _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name)
- if field.type.is_list:
- _c(' xcb_parts[%d].iov_len = %s * sizeof(%s);', count,
- _c_accessor_get_expr(field.type.expr), field.type.member.c_wiretype)
- else:
- # not supposed to happen
- raise Exception("unhandled variable size field %s" % field.c_field_name)
- #_c('/* eeeeeeeeeee */')
- else:
- if not aux:
+
+ for field in param_fields:
+ if not field.type.fixed_size():
+ _c(' /* %s %s */', field.type.c_type, field.c_field_name)
+ # default: simple cast to char *
+ if not field.type.need_serialize and not field.type.need_sizeof:
_c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name)
- idx = serial_fields.index(field)
- if not aux:
- serialize_args = get_serialize_params('unserialize', field.type,
- field.c_field_name,
- '&xcb_aux%d' % idx)[2]
- else:
- serialize_args = get_serialize_params('serialize', field.type,
- '&xcb_aux%d' % idx,
- field.c_field_name)[2]
- serialize_args = reduce(lambda x,y: "%s, %s" % (x,y), [a[2] for a in serialize_args])
- _c(' xcb_parts[%d].iov_len = ', count)
- if aux:
- _c(' %s (%s);', field.type.c_serialize_name, serialize_args)
- _c(' xcb_parts[%d].iov_base = xcb_aux%d;' % (count, idx))
- free_calls.append(' free(xcb_aux%d);' % idx)
+ if field.type.is_list:
+ if field.type.member.fixed_size():
+ _c(' xcb_parts[%d].iov_len = %s * sizeof(%s);', count,
+ _c_accessor_get_expr(field.type.expr), field.type.member.c_wiretype)
+ else:
+ expr = field.type.expr
+ prefix_str, lenfield_prefix = _c_serialize_helper_prefix([('xcb_out', '.', self)],
+ 'xcb_out', '.')
+ param_fields, wire_fields, params = get_serialize_params('sizeof', self)
+ param_names = [p[2] for p in params]
+ sep = '.'
+
+ # look if the list's lenfield is a struct member or a function argument
+ # special case: if the list has a length field, its name will be returned
+ # unchanged by calling c_accessor_get_length(expr)
+ if expr.lenfield_name == _c_accessor_get_length(expr):
+ if expr.lenfield_name in param_names:
+ # the length field appears as separate argument,
+ # so no need for a prefix
+ lenfield_prefix = ''
+
+ list_length = _c_accessor_get_expr(expr, lenfield_prefix, sep)
+
+ length = ''
+ _c(" xcb_parts[%d].iov_len = 0;" % count)
+ _c(" xcb_tmp = (char *)%s;", field.c_field_name)
+ _c(" for(i=0; i<%s; i++) {" % list_length)
+ _c(" xcb_tmp_len = %s(xcb_tmp);" %
+ (field.type.c_sizeof_name))
+ _c(" xcb_parts[%d].iov_len += xcb_tmp_len;" % count)
+ _c(" xcb_tmp += xcb_tmp_len;")
+ _c(" }")
+ else:
+ # not supposed to happen
+ raise Exception("unhandled variable size field %s" % field.c_field_name)
else:
- _c(' %s (%s);', field.type.c_unserialize_name, serialize_args)
+ if not aux:
+ _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name)
+ idx = serial_fields.index(field)
+ aux_var = '&xcb_aux%d' % idx
+ context = 'serialize' if aux else 'sizeof'
+ _c(' xcb_parts[%d].iov_len = ', count)
+ if aux:
+ serialize_args = get_serialize_args(field.type, aux_var, field.c_field_name, context)
+ _c(' %s (%s);', field.type.c_serialize_name, serialize_args)
+ _c(' xcb_parts[%d].iov_base = xcb_aux%d;' % (count, idx))
+ free_calls.append(' free(xcb_aux%d);' % idx)
+ else:
+ serialize_args = get_serialize_args(field.type, field.c_field_name, aux_var, context)
+ func_name = field.type.c_sizeof_name
+ _c(' %s (%s);', func_name, serialize_args)
-
- count += 1
- if not field.type.need_serialize:
- # the _serialize() function keeps track of padding automatically
- _c(' xcb_parts[%d].iov_base = 0;', count)
- _c(' xcb_parts[%d].iov_len = -xcb_parts[%d].iov_len & 3;', count, count-1)
count += 1
+ if not (field.type.need_serialize or field.type.need_sizeof):
+ # the _serialize() function keeps track of padding automatically
+ _c(' xcb_parts[%d].iov_base = 0;', count)
+ _c(' xcb_parts[%d].iov_len = -xcb_parts[%d].iov_len & 3;', count, count-1)
+ count += 1
+
+ # elif self.var_followed_by_fixed_fields:
+ else:
+ # call _serialize()
+ buffer_var = 'xcb_parts[%d].iov_base' % count
+ serialize_args = get_serialize_args(self, '&%s' % buffer_var, '&xcb_out', 'serialize')
+ _c(' %s = (char *) 0;', buffer_var)
+ _c(' xcb_parts[%d].iov_len = %s (%s);', count, self.c_serialize_name, serialize_args)
+ free_calls.append(' free(xcb_parts[%d].iov_base);' % count)
+ # no padding necessary - _serialize() keeps track of padding automatically
_c(' ')
_c(' xcb_ret.sequence = xcb_send_request(c, %s, xcb_parts + 2, &xcb_req);', func_flags)
spacing1 = ' ' * (len(self.c_cookie_type) - len('xcb_connection_t'))
spacing2 = ' ' * (len(self.c_cookie_type) - len('xcb_generic_error_t'))
spacing3 = ' ' * (len(self.c_reply_name) + 2)
-
+
+ # check if _unserialize() has to be called for any field
+ def look_for_special_cases(complex_obj):
+ unserialize_fields = []
+ # no unserialize call in case of switch
+ if not complex_obj.is_switch:
+ for field in complex_obj.fields:
+ # three cases: 1. field with special case
+ # 2. container that contains special case field
+ # 3. list with special case elements
+ if field.type.var_followed_by_fixed_fields:
+ unserialize_fields.append(field)
+ elif field.type.is_container:
+ unserialize_fields += look_for_special_cases(field.type)
+ elif field.type.is_list:
+ if field.type.member.var_followed_by_fixed_fields:
+ unserialize_fields.append(field)
+ if field.type.member.is_container:
+ unserialize_fields += look_for_special_cases(field.type.member)
+ return unserialize_fields
+
+ unserialize_fields = look_for_special_cases(self.reply)
+
_h('')
_h('/**')
_h(' * Return the reply')
_h('%sxcb_generic_error_t%s **e /**< */);', spacing3, spacing2)
_c('%sxcb_generic_error_t%s **e /**< */)', spacing3, spacing2)
_c('{')
- _c(' return (%s *) xcb_wait_for_reply(c, cookie.sequence, e);', self.c_reply_type)
+
+ if len(unserialize_fields)>0:
+ # certain variable size fields need to be unserialized explicitly
+ _c(' %s *reply = (%s *) xcb_wait_for_reply(c, cookie.sequence, e);',
+ self.c_reply_type, self.c_reply_type)
+ _c(' int i;')
+ for field in unserialize_fields:
+ if field.type.is_list:
+ _c(' %s %s_iter = %s(reply);', field.c_iterator_type, field.c_field_name, field.c_iterator_name)
+ _c(' int %s_len = %s(reply);', field.c_field_name, field.c_length_name)
+ _c(' %s *%s_data;', field.c_field_type, field.c_field_name)
+ else:
+ raise Exception('not implemented: call _unserialize() in reply for non-list type %s', field.c_field_type)
+ # call _unserialize(), using the reply as source and target buffer
+ _c(' /* special cases: transform parts of the reply to match XCB data structures */')
+ for field in unserialize_fields:
+ if field.type.is_list:
+ _c(' for(i=0; i<%s_len; i++) {', field.c_field_name)
+ _c(' %s_data = %s_iter.data;', field.c_field_name, field.c_field_name)
+ _c(' %s((const void *)%s_data, &%s_data);', field.type.c_unserialize_name,
+ field.c_field_name, field.c_field_name)
+ _c(' %s(&%s_iter);', field.type.c_next_name, field.c_field_name)
+ _c(' }')
+ # return the transformed reply
+ _c(' return reply;')
+
+ else:
+ _c(' return (%s *) xcb_wait_for_reply(c, cookie.sequence, e);', self.c_reply_type)
+
_c('}')
def _c_opcode(name, opcode):
projects / free-sw / xcb / libxcb / blobdiff