X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fc_client.py;h=3e8f9c6824d370f259005a7f941cb6dd46c77924;hb=b187f029d6bb693f0294bad5261ec486b140f185;hp=40df4939e195f25ab3f444e57da9fb9723c6b49a;hpb=566ae9baee20fb6147b94b89a26796087461bae8;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/c_client.py b/src/c_client.py old mode 100755 new mode 100644 index 40df493..3e8f9c6 --- a/src/c_client.py +++ b/src/c_client.py @@ -16,6 +16,7 @@ _extension_special_cases = ['XPrint', 'XCMisc', 'BigRequests'] _cplusplus_annoyances = {'class' : '_class', 'new' : '_new', 'delete': '_delete'} +_c_keywords = {'default' : '_default'} _hlines = [] _hlevel = 0 @@ -23,9 +24,10 @@ _clines = [] _clevel = 0 _ns = None -# global variable to keep track of serializers +# 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_switch = [] def _h(fmt, *args): ''' @@ -85,6 +87,8 @@ def _cpp(str): ''' if str in _cplusplus_annoyances: return _cplusplus_annoyances[str] + elif str in _c_keywords: + return _c_keywords[str] else: return str @@ -283,20 +287,24 @@ def _c_type_setup(self, name, postfix): 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')) +# 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.var_followed_by_fixed_fields = False # whether a request or reply has a switch field self.need_aux = False self.need_serialize = False if self.is_switch: self.need_serialize = True + self.c_container = 'struct' for bitcase in self.bitcases: + bitcase.c_field_name = _cpp(bitcase.field_name) _c_type_setup(bitcase.type, bitcase.field_type, ()) - if self.is_container: + elif self.is_container: self.c_container = 'union' if self.is_union else 'struct' prev_varsized_field = None @@ -320,11 +328,20 @@ def _c_type_setup(self, name, postfix): 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 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_accessor_name.endswith('_length'): + # raise Exception(field.c_field_name) + #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 @@ -336,27 +353,41 @@ def _c_type_setup(self, name, postfix): if field.type.fixed_size(): prev_varsized_offset += field.type.size + 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 else: self.last_varsized_field = field prev_varsized_field = field prev_varsized_offset = 0 + # very special case - if self.var_followed_by_fixed_fields==True, + # we have to generate accessor functions also for fixed size fields + # now there might a naming conflict if the length field ends with _length + if self.var_followed_by_fixed_fields: + if field.type.is_list: + if field.type.expr.lenfield_name is not None: + full_lenfield_name = _n(name + (field.type.expr.lenfield_name,)) + if full_lenfield_name == field.c_length_name: + field.c_length_name += '_' + # as switch does never appear at toplevel, # continue here with type construction if self.is_switch: - print "switch", self.name - # special: switch C structs get pointer fields for variable-sized members - _c_complex(self) - # declare switch (un)packing functions - _c_accessors(self, name, name) + if self.c_type not in finished_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: - # if not hasattr(self, 'in_reply'): + finished_serializers.append(self.c_serialize_name) _c_serialize(self) _c_unserialize(self) - finished_serializers.append(self.c_serialize_name) # _c_type_setup() def get_request_fields(self): @@ -369,34 +400,39 @@ def get_request_fields(self): param_fields.append(field) if field.wire and not field.auto: if field.type.fixed_size() and not self.is_switch: - # need to set the field up in the xcb_out structure + # field in the xcb_out structure wire_fields.append(field) # fields like 'pad0' are skipped! return (param_fields, wire_fields) # get_request_fields() -def get_switch_expr_fields(self): - # get the fields referenced by the switch expression - def get_expr_fields(expr): +def get_expr_fields(self): + # get the fields referenced by switch or list expression + def get_expr_field_names(expr): if expr.op is None: if expr.lenfield_name is not None: return [expr.lenfield_name] + else: + # constant value expr + return [] else: if expr.op == '~': - return get_expr_fields(expr.rhs) + return get_expr_field_names(expr.rhs) elif expr.op == 'popcount': - return get_expr_fields(expr.rhs) + return get_expr_field_names(expr.rhs) elif expr.op == 'sumof': return [expr.lenfield_name] elif expr.op == 'enumref': return [] - else: - return get_expr_fields(expr.lhs) + get_expr_fields(expr.rhs) - # get_expr_fields() + else: + return get_expr_field_names(expr.lhs) + get_expr_field_names(expr.rhs) + # get_expr_field_names() # resolve the field names with the parent structure(s) - unresolved_fields = get_expr_fields(self.expr) + unresolved_fields = get_expr_field_names(self.expr) + if unresolved_fields is None: + return [] expr_fields = dict.fromkeys(unresolved_fields) for p in reversed(self.parent): parent_fields = dict((f.field_name, f) for f in p.fields) @@ -408,96 +444,136 @@ def get_switch_expr_fields(self): break if None in expr_fields.values(): - raise Exception("could not resolve all fields for %s" % self.name) + raise Exception("could not resolve all fields for %s" % self.name) params = expr_fields.values() return params -# get_switch_expr_fields() +# get_expr_fields() + +def resolve_fields(anchestor, complex_obj=None): + """find fields referenced by anchestor or descendents with external scope""" + expr_fields = [] + unresolved = [] + all_fields = [] + if complex_obj is None: + complex_obj = anchestor + for field in complex_obj.fields: + all_fields.append(field) + if field.type.is_switch or field.type.is_list: + expr_fields += get_expr_fields(field.type) + if field.type.is_container: + expr_fields += resolve_fields(anchestor, field.type) + # try to resolve expr fields + for e in expr_fields: + if e not in all_fields: + unresolved.append(e) + return unresolved + +def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'): + def add_param(params, param): + if param not in params: + params.append(param) -def get_serialize_params(self, buffer_var='_buffer', aux_var='_aux', unserialize=False): param_fields, wire_fields = get_request_fields(self) if self.is_switch: - param_fields = get_switch_expr_fields(self) + param_fields = get_expr_fields(self) # _serialize function parameters - if not unserialize: - params = [('void', '**', buffer_var)] - else: - params = [('const void', '*', buffer_var)] + # cannot use set() for params, as series is important + params = [] + if 'serialize' == context: + params.append(('void', '**', buffer_var)) + elif 'unserialize' == context: + params.append(('const void', '*', buffer_var)) + + # look for special cases + unresolved_fields = resolve_fields(self) + for f in unresolved_fields: + add_param(params, (f.c_field_type, '', f.c_field_name)) # make sure all required length fields are present for p in param_fields: if p.visible and not p.wire and not p.auto: typespec = p.c_field_type pointerspec = '' - params.append((typespec, pointerspec, p.c_field_name)) + add_param(params, (typespec, pointerspec, p.c_field_name)) # parameter fields if any if self.is_switch: - for p in get_switch_expr_fields(self): + for p in get_expr_fields(self): typespec = p.c_field_const_type - pointerspec = p.c_pointer - params.append((typespec, pointerspec, p.c_field_name)) + pointerspec = p.c_pointer + add_param(params, (typespec, pointerspec, p.c_field_name)) # aux argument - structure to be serialized - if not unserialize: - params.append(('const %s' % self.c_type, '*', aux_var)) - elif self.is_switch: - params.append(('%s' % self.c_type, '*', aux_var)) - if not self.is_switch and not unserialize: + if 'serialize' == context: + add_param(params, ('const %s' % self.c_type, '*', aux_var)) + elif 'unserialize' == context and self.is_switch: + 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(): - params.append((p.c_field_const_type, p.c_pointer, p.c_field_name)) + add_param(params, (p.c_field_const_type, '*', p.c_field_name)) return (param_fields, wire_fields, params) # get_serialize_params() -def _c_field_mapping(complex_type, context): - def get_prefix(field): - prefix = '' - if context in ('serialize', 'unserialize'): - if field.type.fixed_size() or complex_type.is_switch: - prefix = '_aux->' - else: - raise Exception("unknown context '%s' in c_field_mapping" % context) - return prefix +def _c_serialize_helper_prefix(prefix): + # prefix is a list of (field_name, anchestor object) tuples + # concatenate field names + prefix_str = '' + for name, sep, obj in prefix: + prefix_str += name + if sep == '': + sep = '.' if (obj.is_bitcase and obj.has_name) else '->' + prefix_str += sep + lenfield_prefix = '' if prefix_str.find('_aux')==0 else "_aux" + if prefix_str != '': + if lenfield_prefix != '': + lenfield_prefix += '->' + lenfield_prefix += prefix_str + return (prefix_str, lenfield_prefix) +# _c_serialize_helper_prefix + +def _c_field_mapping(context, complex_type, prefix): + def get_prefix(field, prefix): + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + if prefix_str == '': + if context in ('serialize', 'unserialize'): + if field.type.fixed_size() or complex_type.is_switch: + prefix_str = '_aux->' + else: + raise Exception("unknown context '%s' in c_field_mapping" % context) + return prefix_str # get_prefix() - def get_field_name(fields, complex_type, prefix=''): + def get_field_name(fields, complex_type, prefix): for f in complex_type.fields: - if '' == prefix: - prefix = get_prefix(f) + prefix_str = get_prefix(f, prefix) - fname = "%s%s" % (prefix, f.c_field_name) + 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: - new_prefix = "%s%s" % (prefix, f.c_field_name) - new_prefix += "." if f.type.is_switch else "->" - get_field_name(fields, f.type, new_prefix) + get_field_name(fields, f.type, prefix+[(f.c_field_name, '', f.type)]) # get_field_name() # dict(field_name : (c_field_name, field)) fields = {} - get_field_name(fields, complex_type) + get_field_name(fields, complex_type, prefix) # switch: get the fields referenced by the switch expr as well # these may not belong to any structure if complex_type.is_switch: - fields += get_serialize_params() + pass +# FIXME: fields += get_serialize_params(context, complex_type) return fields # _c_field_mapping() -def _c_serialize_helper_prefix(prefix): - prefix_str = prefix - lenfield_prefix = "_aux" - if prefix != '': - prefix_str += "->" - lenfield_prefix += "->%s" % prefix - return (prefix_str, lenfield_prefix) -# _c_serialize_helper_prefix - -def _c_serialize_helper_insert_padding(context, code_lines, space, count=0): +def _c_serialize_helper_insert_padding(context, code_lines, space): + code_lines.append('%s xcb_buffer_len += xcb_block_len;' % space) code_lines.append('%s /* padding */' % space) code_lines.append('%s xcb_pad = -xcb_block_len & 3;' % space) code_lines.append('%s if (0 != xcb_pad) {' % space) @@ -508,194 +584,268 @@ def _c_serialize_helper_insert_padding(context, code_lines, space, count=0): code_lines.append('%s xcb_parts_idx++;' % space) elif 'unserialize' == context: code_lines.append('%s xcb_tmp += xcb_pad;' % space) - code_lines.append('%s xcb_buffer_len += xcb_pad;' % space) - + + code_lines.append('%s xcb_buffer_len += xcb_pad;' % space) code_lines.append('%s xcb_pad = 0;' % space) code_lines.append('%s }' % space) - code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) code_lines.append('%s xcb_block_len = 0;' % space) - return count + 1 + + return 1 # _c_serialize_helper_insert_padding() -def _c_serialize_helper_switch(self, context, complex_name, code_lines, temp_vars, space, prefix, prefix_str): +def _c_serialize_helper_switch(context, self, complex_name, + code_lines, temp_vars, + space, prefix): + count = 0 + 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) + bitcase_expr = _c_accessor_get_expr(b.type.expr, prefix_str) code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr)) - # FIXME: change function call depending on context - if 'unserialize' == context: - unserialize_fields(b.type, code_lines, temp_vars, space="%s " % space, - prefix="%s%s" % (prefix_str, complex_name), bitcase=True) - elif 'serialize' == context: - count += serialize_fields(b.type, code_lines, temp_vars, '%s ' % space, - prefix="%s%s" % (prefix_str, complex_name), - serialize_fixed_size_fields=True, bitcase=True) + 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) code_lines.append(' }') if 'serialize' == context: - count = insert_padding(count) - return count + count = _c_serialize_helper_insert_padding(context, code_lines, space) if 'unserialize' == context: # padding code_lines.append('%s xcb_pad = -xcb_block_len & 3;' % space) - #code_lines.append('%s xcb_tmp += xcb_block_len;' % space) code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) + + return count # _c_serialize_helper_switch -def _c_serialize_helper_switch_field(self, field): +def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, prefix): # switch is handled by this function as a special case - args = get_switch_expr_fields(field.type) - field_mapping = _c_field_mapping(self, 'unserialize') + param_fields, wire_fields, params = get_serialize_params(context, self) + args = get_expr_fields(field.type) + field_mapping = _c_field_mapping(context, self, prefix) + + # determine which params to pass to _unserialize() and their prefixes + switch_len_fields = resolve_fields(self, field.type) + bitcase_unresolved = resolve_fields(self, self) + if len(bitcase_unresolved) != 0: + raise Exception('unresolved fields within bitcase is not supported at this point') c_field_names = '' + for a in switch_len_fields: + c_field_names += "%s, " % field_mapping[a.c_field_name][0] for a in args: - c_field_names += "%s, " % field_mapping[a.field_name][0] - switch_field_name = field_mapping[field.field_name][0] + 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, switch_field_name) + c_field_names, c_switch_variable) #switch_field_name) return length # _c_serialize_helper_switch_field() -def _c_serialize_helper_list_field(context, self, field, lenfield_prefix, code_lines, temp_vars, space): +def _c_serialize_helper_list_field(context, self, field, + code_lines, temp_vars, + space, prefix): + """ + helper function for (un)serialize to cope with lists of variable length + """ expr = field.type.expr - param_fields, wire_fields, params = get_serialize_params(self, unserialize=True) + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + param_fields, wire_fields, params = get_serialize_params('unserialize', self) param_names = [p[2] for p in params] # 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 returned + # 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 in unserialize, # so no need for a prefix lenfield_prefix = '' - list_length = _c_accessor_get_expr(field.type.expr, lenfield_prefix) - - if 'unserialize' == context: - length = '%s * sizeof(%s)' % (list_length, field.type.member.c_wiretype) - # FIXME? - list with variable-sized elements - if field.type.size is None: - length = '' - temp_vars.add(' unsigned int i, xcb_tmp_len;') + sep = '.' if (self.is_bitcase and self.has_name) else '->' + 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: + length = '' + if 'unserialize' == context: + int_i = ' unsigned int i;' + xcb_tmp_len = ' unsigned int xcb_tmp_len;' + if int_i not in temp_vars: + temp_vars.append(int_i) + if xcb_tmp_len 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)) 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) - # errmsg = '%s: warning: list object with variable-sized members not supported for field %s\n' - # raise Exception(errmsg % (self.c_type, field.c_field_name)) - + elif 'serialize' == context: + code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = 0;' % 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_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) + return length # _c_serialize_helper_list_field() -def unserialize_fields(complex_type, code_lines=[], temp_vars=set(), space='', prefix='', bitcase=False): - need_padding = False - +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)) prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) - if hasattr(complex_type, 'type'): - self = complex_type.type - complex_name = complex_type.name - else: - self = complex_type - complex_name = '_aux' + length = "sizeof(%s)" % field.c_field_type - # special case: switch is serialized by evaluating each bitcase separately - if self.is_switch: - need_padding = True - _c_serialize_helper_switch(self, 'unserialize', complex_name, code_lines, temp_vars, space, prefix, prefix_str) - - # all other data types can be evaluated one field a time - else: - # fixed sized fields: simply cast the buffer to the respective xcb_out type - # this would of course not work for switch/bitcase - if not bitcase: - _c_serialize_helper_insert_padding('unserialize', code_lines, space) + if 'unserialize' == context: + 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 = '' + for i in range(field.type.nmemb): + 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: + value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) ' + + if field.type.is_expr: + # need to register a temporary variable for the expression + if field.type.c_type is None: + raise Exception("type for field '%s' (expression '%s') unkown" % + (field.field_name, _c_accessor_get_expr(field.type.expr))) + temp_vars.append(' %s xcb_expr_%s = %s;' % (field.type.c_type, field.field_name, + _c_accessor_get_expr(field.type.expr, prefix))) + value += "&xcb_expr_%s;" % field.field_name + + elif field.type.is_pad: + if field.type.nmemb == 1: + value += "&xcb_pad;" + else: + # FIXME - possible segmentation fault!! + value = ' memset(xcb_parts[xcb_parts_idx].iov_base, 0, %d);' % field.type.nmemb + length += "*%d" % field.type.nmemb - for field in self.fields: - if not ((field.wire and not field.auto) or field.visible): - continue + else: + # non-list type with fixed size + if field.type.nmemb == 1: + value += "&%s%s;" % (prefix_str, field.c_field_name) + # list with nmemb (fixed size) elements + else: + value += '%s%s;' % (prefix_str, field.c_field_name) + length = '%d' % field.type.nmemb - # generic length statement - length = "sizeof(%s)" % field.c_field_type - - # switch/bitcase: fixed size fields must be considered explicitly - if field.type.fixed_size(): - if bitcase: - need_padding = True - value = ' _aux->%s = (%s) *xcb_tmp;' % (field.c_field_name, field.type.c_type) - # FIXME - lists - else: - continue + return (value, length) +# _c_serialize_helper_fields_fixed_size() - # fields with variable size - elif not field.type.fixed_size(): - # switch/bitcase: always calculate padding before and after variable sized fields - # FIXME - if need_padding or bitcase: - _c_serialize_helper_insert_padding('unserialize', code_lines, space) +def _c_serialize_helper_fields_variable_size(context, self, field, + code_lines, temp_vars, + space, prefix): + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) -# value = ' *%s = (%s *) xcb_tmp;' % (field.c_field_name, field.type.c_type) - value = '' + if 'unserialize' == context: + value = '' + 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) + length = '' - if field.type.is_list: - length = _c_serialize_helper_list_field('unserialize', - self, field, lenfield_prefix, - code_lines, temp_vars, space) + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + code_lines.append('%s /* %s */' % (space, field.c_field_name)) - elif field.type.is_switch: - length = _c_serialize_helper_switch_field(self, field) + if field.type.is_list: + 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) + else: + length = "%s(xcb_tmp)" % (field.type.c_unserialize_name) - else: - length = "%s(xcb_tmp)" % (field.type.c_unserialize_name) - # errmsg = '%s: warning: non-list object of variable size not supported for field %s\n' - # raise Exception(errmsg % (self.c_type, field.c_field_name)) - - # save unserialization C code - if value is not None: - if field.type.fixed_size(): - # field appears in the request structure - code_lines.append('%s /* %s.%s */' % (space, self.c_type, field.c_field_name)) - else: - code_lines.append('%s /* %s */' % (space, field.c_field_name)) - - # _aux->XXX = - if value != '': - code_lines.append('%s%s' % (space, value)) - if field.type.fixed_size(): - code_lines.append('%s xcb_block_len += %s;' % (space, length)) - code_lines.append('%s xcb_tmp += %s;' % (space, length)) - else: - # padding - if length != '': - code_lines.append('%s xcb_block_len = %s;' % (space, length)) - code_lines.append('%s xcb_pad = -xcb_block_len & 3;' % space) - code_lines.append('%s xcb_tmp += xcb_block_len + xcb_pad;' % space) - code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) - code_lines.append('%s xcb_block_len = 0;' % space) - code_lines.append('%s xcb_pad = 0;' % space) - need_padding = False -# unserialize_fields() - -def serialize_fields(complex_type, code_lines=[], temp_vars=set(), - space='', prefix='', serialize_fixed_size_fields=False, - bitcase=False): - """ - helper routine to build up iovec arrays that will later be copied into a single buffer + return (value, length) +# _c_serialize_helper_fields_variable_size - complex_type - encapsulating Type/Field - code_lines, temp_vars - containers for generated code & variable declarations - space - extra space to be inserted before any statement - prefix - prefix to be used for struct members, needed for switch/bitcase mapping - bitcase - flags whether fields are bitcase members - """ - - # count -> no. of entries in xcb_parts array +def _c_serialize_helper_fields(context, self, + code_lines, temp_vars, + space, prefix, is_bitcase): count = 0 - # flag to mark wether explicit padding needs to be inserted - need_padding = False - prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + need_padding = False + prev_field_was_variable = False + + for field in self.fields: + if not ((field.wire and not field.auto) or field.visible): + continue + + # switch/bitcase: fixed size fields must be considered explicitly + if field.type.fixed_size(): + 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: + fixed_prefix = [('_aux', '->', self)] + value, length = _c_serialize_helper_fields_fixed_size(context, self, field, + code_lines, temp_vars, + space, fixed_prefix) + else: + continue + # fields with variable size + else: + # switch/bitcase: always calculate padding before and after variable sized fields + if need_padding or is_bitcase: + _c_serialize_helper_insert_padding(context, code_lines, space) + + 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)) + if field.type.fixed_size() and is_bitcase: + code_lines.append('%s xcb_block_len += %s;' % (space, length)) + if 'unserialize' == context: + 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: + code_lines.append('%s xcb_tmp += xcb_block_len;' % space) + if 'serialize' == context: + if '' != length: + code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = xcb_block_len;' % space) + code_lines.append('%s xcb_parts_idx++;' % space) + count += 1 + need_padding = True + + return count +# _c_serialize_helper_fields() + +def _c_serialize_helper(context, complex_type, + code_lines, temp_vars, + space='', prefix=[]): + count = 0 if hasattr(complex_type, 'type'): self = complex_type.type complex_name = complex_type.name @@ -703,162 +853,28 @@ def serialize_fields(complex_type, code_lines=[], temp_vars=set(), self = complex_type complex_name = '_aux' - param_fields, wire_fields, params = get_serialize_params(self, unserialize=True) - param_names = [p[2] for p in params] - - def insert_padding(count): - code_lines.append('%s /* padding */' % space) - code_lines.append('%s xcb_pad = -xcb_block_len & 3;' % space) - code_lines.append('%s if (0 != xcb_pad) {' % space) - 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) - code_lines.append('%s }' % space) - code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) - code_lines.append('%s xcb_pad = 0;' % space) - code_lines.append('%s xcb_block_len = 0;' % space) - need_padding = True - return count + 1 - # insert_padding() - - # special case - if self.is_switch, all fields need to be serialized conditionally + # special case: switch is serialized by evaluating each bitcase separately if self.is_switch: - switch_expr = _c_accessor_get_expr(self.expr) - need_padding = True + count += _c_serialize_helper_switch(context, self, complex_name, + code_lines, temp_vars, + space, prefix) - for b in self.bitcases: - bitcase_expr = _c_accessor_get_expr(b.type.expr, prefix) - code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr)) - - count += serialize_fields(b.type, code_lines, temp_vars, '%s ' % space, - prefix="%s%s" % (prefix_str, complex_name), - serialize_fixed_size_fields=True, bitcase=True) - code_lines.append(' }') - count = insert_padding(count) - + # all other data types can be evaluated one field a time else: - for field in self.fields: - value = None - - # sort out invisible fields - if not ((field.wire and not field.auto) or field.visible): - continue + # unserialize & fixed size fields: simply cast the buffer to the respective xcb_out type + if 'unserialize' == context 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) - length = "sizeof(%s)" % field.c_field_type - - # switch/bitcase: fixed size fields are serialized explicitly - if field.type.fixed_size() and bitcase: - value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) ' - need_padding = True - - if field.type.is_expr: - # need to register a temporary variable for the expression - if field.type.c_type is None: - raise Exception("type for field '%s' (expression '%s') unkown" % - (field.field_name, _c_accessor_get_expr(field.type.expr))) - temp_vars.add(' %s xcb_expr_%s = %s;' % (field.type.c_type, field.field_name, - _c_accessor_get_expr(field.type.expr, prefix))) - value += "&xcb_expr_%s;" % field.field_name - - elif field.type.is_pad: - if field.type.nmemb == 1: - value += "&xcb_pad;" - else: - value = ' memset(xcb_parts[xcb_parts_idx].iov_base, 0, %d);' % field.type.nmemb - length += "*%d" % field.type.nmemb - - else: - # non-list type with fixed size - if field.type.nmemb == 1: - value += "&%s%s;" % (prefix_str, field.c_field_name) - # list with nmemb (fixed size) elements - else: - value += '%s%s;' % (prefix_str, field.c_field_name) - length = '%d' % field.type.nmemb - - # fields with variable size - elif not field.type.fixed_size(): - # calculate padding before variable sized fields only if necessary - if bitcase or need_padding: - count = insert_padding(count) - code_lines.append('%s xcb_block_len = 0;' % space) - need_padding = False - - code_lines.append('%s /* %s */' % (space, field.c_field_name)) - value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s%s;' % (prefix_str, field.c_field_name) - length = '' - code_lines.append('%s%s' % (space, value)) + count += _c_serialize_helper_fields(context, self, + code_lines, temp_vars, + space, prefix, False) + # "final padding" + count += _c_serialize_helper_insert_padding(context, code_lines, space) - if field.type.is_list: - # list of variable length with variable size elements - if field.type.size is None: - errmsg = '%s: warning: list object with variable-sized members not supported for field %s\n' - sys.stderr.write(errmsg % (self.c_type, field.c_field_name)) - code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = 0;' % 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(field.type.expr, lenfield_prefix))) - code_lines.append('%s xcb_block_len = %s(xcb_tmp);' % (space, field.type.c_unserialize_name)) - code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len += xcb_block_len;' % space) - code_lines.append('%s xcb_tmp += xcb_block_len;' % space) - code_lines.append('%s }' % space) - code_lines.append('%s xcb_block_len = xcb_parts[xcb_parts_idx].iov_len;' % space) - - # list of variable length with fixed size elements - else: - # look if the list's lenfield is a struct member or a function argument - lf_prefix = lenfield_prefix - # special case: if the list has a length field, its name will returned - # unchanged by calling c_accessor_get_length(expr) - expr = field.type.expr - if expr.lenfield_name == _c_accessor_get_length(expr): - if expr.lenfield_name in param_names: - # the length field appears as separate argument in unserialize, - # so no need for a prefix - lf_prefix = '' - - length = '%s * sizeof(%s)' % (_c_accessor_get_expr(field.type.expr, lf_prefix), - field.type.member.c_wiretype) - - elif field.type.is_switch: - # switch is handled at the beginning of this function as a special case -# count += serialize_fields(field.type, code_lines, temp_vars, space, - # prefix="%s%s" % (prefix_str, field.c_field_name)) - # FIXME - call another serialize - value = '' - sys.stderr.write("FIXME: call %s" % field.type.c_serialize_name) - length = 'undefined' - else: - # FIXME - variable sized field that is not a list - errmsg = '%s: warning: non-list object of variable size not supported for field %s\n' - sys.stderr.write(errmsg % (self.c_type, field.c_field_name)) - length = '%s * sizeof(%s)' % ('undefined', field.type.c_wiretype) - - # save serialization C code using xcb_parts[].iov_base and xcb_parts[].iov_len - if value is not None: - if field.type.fixed_size(): - # field belongs to some anchestor structure - code_lines.append('%s /* %s.%s */' % (space, self.c_type, field.c_field_name)) - code_lines.append('%s%s' % (space, value)) - if bitcase: - code_lines.append('%s xcb_block_len += %s;' % (space, length)) - if length != '': - if not field.type.fixed_size(): - code_lines.append('%s xcb_block_len = %s;' % (space, length)) - code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = xcb_block_len;' % space) - # increase xcb_parts index - code_lines.append('%s xcb_parts_idx++;' % space) - count += 1 - - if not field.type.fixed_size(): - # FIXME - count = insert_padding(count) - need_padding = False - # raise Exception("obsolete - should not be reached") - # code_lines.append('%s xcb_unpadded = xcb_parts[xcb_parts_idx].iov_len;' % space) - - return count -# serialize_fields() + return count +# _c_serialize_helper() def _c_serialize(self): _h_setlevel(1) @@ -871,7 +887,7 @@ def _c_serialize(self): variable_size_fields = 0 # maximum space required for type definition of function arguments maxtypelen = 0 - param_fields, wire_fields, params = get_serialize_params(self) + param_fields, wire_fields, params = get_serialize_params('serialize', self) # determine N(variable_fields) for field in param_fields: @@ -883,17 +899,17 @@ def _c_serialize(self): maxtypelen = max(maxtypelen, len(p[0]) + len(p[1])) # write to .c/.h - for p in range(len(params)): + for idx, p in enumerate(params): line = "" - typespec, pointerspec, field_name = params[p] + typespec, pointerspec, field_name = p indent = ' '*(len(self.c_serialize_name)+2) # p==0: function declaration - if 0==p: + if 0==idx: line = "%s (" % self.c_serialize_name indent = '' spacing = ' '*(maxtypelen-len(typespec)-len(pointerspec)) line += "%s%s%s %s%s /**< */" % (indent, typespec, spacing, pointerspec, field_name) - if p < len(params)-1: + if idx < len(params)-1: _hc("%s," % line) else: _h("%s);" % line) @@ -909,35 +925,26 @@ def _c_serialize(self): _c(' unsigned int xcb_buffer_len = 0;') if variable_size_fields > 0: code_lines = [] - temp_vars = set() - count = serialize_fields(self, code_lines, temp_vars, - serialize_fixed_size_fields=False) + temp_vars = [] + count =_c_serialize_helper('serialize', self, + code_lines, temp_vars) # update variable size fields variable_size_fields = count - _c(' unsigned int xcb_pad = 0;') - _c(' char xcb_pad0[3] = {0, 0, 0};') - _c(' struct iovec xcb_parts[%d];', count+1) - _c(' unsigned int xcb_parts_idx = 0;') - _c(' unsigned int xcb_block_len = 0;') + 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(' unsigned int xcb_parts_idx = 0;') + temp_vars.append(' unsigned int xcb_block_len = 0;') + temp_vars.append(' unsigned int i;') + temp_vars.append(' char *xcb_tmp;') for t in temp_vars: _c(t) - _c(' char *xcb_tmp;') - _c(' unsigned int i;') _c('') if variable_size_fields > 0: for l in code_lines: _c(l) - -# _c(' /* padding */') -# _c(' xcb_pad = -xcb_block_len & 3;') -# _c(' if (0 != xcb_pad) {') -# _c(' xcb_parts[xcb_parts_idx].iov_base = xcb_pad0;') -# _c(' xcb_parts[xcb_parts_idx].iov_len = xcb_pad;') -# _c(' xcb_parts_idx++;') -# _c(' }') -# _c(' xcb_buffer_len += xcb_block_len + xcb_pad;') _c('') # variable sized fields have been collected, now @@ -965,9 +972,7 @@ def _c_serialize(self): # variable sized fields _c(' for(i=0; idata;', 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;') @@ -1151,34 +1168,42 @@ def _c_iterator(self, name): _c(' return ret;') _c('}') -def _c_accessor_get_length(expr, prefix=''): +def _c_accessor_get_length(expr, prefix='', sep='->'): ''' Figures out what C code is needed to get a length field. For fields that follow a variable-length field, use the accessor. Otherwise, just reference the structure field directly. ''' - prefarrow = '' if prefix == '' else prefix + '->' - + prefarrow = '' if prefix == '' else prefix + sep + if expr.lenfield != None and expr.lenfield.prev_varsized_field != None: - return expr.lenfield.c_accessor_name + '(' + prefix + ')' + # special case: variable and fixed size fields are intermixed + retval = expr.lenfield.c_accessor_name + '(' + prefix + ')' + if prefix in ('', '_aux'): + prefix_str = '' if prefix=='' else '%s' % (prefarrow) + retval = '%s%s' % (prefix_str, expr.lenfield_name) + return retval elif expr.lenfield_name != None: - return prefarrow + expr.lenfield_name + if prefix.endswith(sep): + return prefix + expr.lenfield_name + else: + return prefarrow + expr.lenfield_name else: return str(expr.nmemb) -def _c_accessor_get_expr(expr, prefix=''): +def _c_accessor_get_expr(expr, prefix='', sep='->'): ''' Figures out what C code is needed to get the length of a list field. Recurses for math operations. Returns bitcount for value-mask fields. Otherwise, uses the value of the length field. ''' - lenexp = _c_accessor_get_length(expr, prefix) + lenexp = _c_accessor_get_length(expr, prefix, sep) if expr.op == '~': - return '(' + '~' + _c_accessor_get_expr(expr.rhs, prefix) + ')' + return '(' + '~' + _c_accessor_get_expr(expr.rhs, prefix, sep) + ')' elif expr.op == 'popcount': - return 'xcb_popcount(' + _c_accessor_get_expr(expr.rhs, prefix) + ')' + return 'xcb_popcount(' + _c_accessor_get_expr(expr.rhs, prefix, sep) + ')' elif expr.op == 'enumref': enum_name = expr.lenfield_type.name constant_name = expr.lenfield_name @@ -1194,17 +1219,19 @@ def _c_accessor_get_expr(expr, prefix=''): break if field is None: raise Exception("list field '%s' referenced by sumof not found" % expr.lenfield_name) - if prefix != '': - prefix = "%s->" % prefix + if prefix != '' and not prefix.endswith(sep): + 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 + 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: - return '(' + _c_accessor_get_expr(expr.lhs, prefix) + ' ' + expr.op + ' ' + _c_accessor_get_expr(expr.rhs, prefix) + ')' + return '(' + _c_accessor_get_expr(expr.lhs, prefix, sep) + ' ' + expr.op + ' ' + _c_accessor_get_expr(expr.rhs, prefix, sep) + ')' elif expr.bitfield: return 'xcb_popcount(' + lenexp + ')' else: - return lenexp + return lenexp + '/* bla */' def _c_accessors_field(self, field): ''' @@ -1226,9 +1253,12 @@ def _c_accessors_field(self, field): _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('{') - _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) + if field.prev_varsized_field is None: + _c(' return (%s *) (R + 1);', field.c_field_type) + 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('}') else: _hc('') @@ -1246,8 +1276,12 @@ def _c_accessors_field(self, field): _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('{') - _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) + if field.prev_varsized_field is None: + _c(' return (%s *) (R + 1);', field.c_field_type) + 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('}') def _c_accessors_list(self, field): @@ -1277,7 +1311,7 @@ def _c_accessors_list(self, field): _c('%s (const %s *R /**< */)', field.c_accessor_name, self.c_type) _c('{') - if field.prev_varsized_field == None: + if field.prev_varsized_field is None: _c(' return (%s *) (R + 1);', field.c_field_type) else: _c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R')) @@ -1366,9 +1400,13 @@ def _c_accessors(self, name, base): 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: + elif field.prev_varsized_field != None or not field.type.fixed_size(): _c_accessors_field(self, field) def c_simple(self, name): @@ -1405,16 +1443,16 @@ def _c_complex(self): 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 @@ -1422,17 +1460,30 @@ def _c_complex(self): length += 1 maxtypelen = max(maxtypelen, length) - for field in struct_fields: + def _c_complex_field(self, field, space=''): if (field.type.fixed_size() or # in case of switch with switch children, don't make the field a pointer # necessary for unserialize to work (self.is_switch and field.type.is_switch)): spacing = ' ' * (maxtypelen - len(field.c_field_type)) - _h(' %s%s %s%s; /**< */', field.c_field_type, spacing, field.c_field_name, field.c_subscript) - + _h('%s %s%s %s%s; /**< */', space, field.c_field_type, spacing, field.c_field_name, field.c_subscript) else: spacing = ' ' * (maxtypelen - (len(field.c_field_type) + 1)) - _h(' %s%s *%s%s; /**< */', field.c_field_type, spacing, field.c_field_name, field.c_subscript) + _h('%s %s%s *%s%s; /**< */', space, field.c_field_type, spacing, field.c_field_name, field.c_subscript) + + if not self.is_switch: + for field in struct_fields: + _c_complex_field(self, field) + else: + for b in self.bitcases: + space = '' + if b.type.has_name: + _h(' struct _%s {', b.c_field_name) + space = ' ' + for field in b.type.fields: + _c_complex_field(self, field, space) + if b.type.has_name: + _h(' } %s;', b.c_field_name) _h('} %s;', self.c_type) @@ -1567,23 +1618,29 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False): for field in param_fields: count = count - 1 c_field_const_type = field.c_field_const_type + c_pointer = field.c_pointer if field.type.need_serialize and not aux: c_field_const_type = "const void" + c_pointer = '*' spacing = ' ' * (maxtypelen - len(c_field_const_type)) comma = ',' if count else ');' _h('%s%s%s %s%s /**< */%s', func_spacing, c_field_const_type, - spacing, field.c_pointer, field.c_field_name, comma) + spacing, c_pointer, field.c_field_name, comma) comma = ',' if count else ')' _c('%s%s%s %s%s /**< */%s', func_spacing, c_field_const_type, - spacing, field.c_pointer, field.c_field_name, comma) + spacing, c_pointer, field.c_field_name, comma) count = 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 + 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 + else: + # there will be only one call to _serialize() and no need for additional padding + count -= 1 _c('{') _c(' static const xcb_protocol_request_t xcb_req = {') @@ -1597,9 +1654,15 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False): _c(' struct iovec xcb_parts[%d];', count + 2) _c(' %s xcb_ret;', func_cookie) _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: + _c(' void *xcb_aux%d = 0;' % (idx)) _c(' ') _c(' printf("in function %s\\n");' % func_name) @@ -1619,55 +1682,72 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False): else: _c(' memcpy(xcb_out.%s, %s, %d);', field.c_field_name, field.c_field_name, field.type.nmemb) - _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;') + def get_serialize_args(type_obj, c_field_name, aux_var, unserialize=False): + if unserialize: + serialize_args = get_serialize_params('unserialize', type_obj, + c_field_name, + aux_var)[2] + else: + serialize_args = get_serialize_params('serialize', type_obj, + aux_var, + c_field_name)[2] + serialize_args = reduce(lambda x,y: "%s, %s" % (x,y), [a[2] for a in serialize_args]) + return serialize_args # calls in order to free dyn. all. memory free_calls = [] - count = 4 - for field in param_fields: - if not field.type.fixed_size(): - if not field.type.need_serialize: - _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name) - else: - if not aux: + + 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;') + + count = 4 + + 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: _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) else: - _c(' xcb_parts[%d].iov_base = (char *) 0;', count) - idx = serial_fields.index(field) - if not aux: - serialize_args = get_serialize_params(field.type, - field.c_field_name, - '&xcb_aux%d' % idx)[2] - else: - serialize_args = get_serialize_params(field.type, - '&xcb_parts[%d].iov_base' % count, - 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) - free_calls.append(' free(xcb_parts[%d].iov_base);' % count) - else: - _c(' %s (%s);', field.type.c_unserialize_name, serialize_args) - 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) - elif not field.type.need_serialize: - # FIXME - _serialize() - _c(' xcb_parts[%d].iov_len = %s * sizeof(%s);', - count, 'Uh oh', field.type.c_wiretype) - - 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) + 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 + serialize_args = get_serialize_args(field.type, field.c_field_name, aux_var, not aux) + _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) + else: + _c(' %s (%s);', field.type.c_unserialize_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 + + # elif self.var_followed_by_fixed_fields: + else: + # call _serialize() + buffer_var = 'xcb_parts[%d].iov_base' % count + serialize_args = get_serialize_args(self, '&xcb_out', '&%s' % buffer_var, False) + _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)