X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fc_client.py;h=7b0507739ebd285206519dbfd86ca80bfaa149cd;hb=1c590d5a86ae854e53f388e40c952e92f11d59e6;hp=469a7f5daebc9a597abb016f1ebbad0cb9867ab0;hpb=86704124b1fd62c30441ace1f3f8e2c316801c53;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/c_client.py b/src/c_client.py old mode 100755 new mode 100644 index 469a7f5..7b05077 --- a/src/c_client.py +++ b/src/c_client.py @@ -23,6 +23,10 @@ _clines = [] _clevel = 0 _ns = None +# global variable to keep track of serializers +# due to weird dependencies, I see no way to do this more elegant at the moment +finished_serializers = [] + def _h(fmt, *args): ''' Writes the given line to the header file. @@ -158,6 +162,7 @@ def c_open(self): _h('') _h('#include "xcb.h"') + _c('#include ') _c('#include ') _c('#include ') _c('#include "xcbext.h"') @@ -278,6 +283,10 @@ 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')) # whether a request or reply has a switch field self.need_aux = False @@ -295,13 +304,12 @@ def _c_type_setup(self, name, postfix): first_field_after_varsized = None for field in self.fields: - # information about a fields anchestors - if self.is_reply or hasattr(self, 'in_reply'): - field.type.in_reply = True - _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 field.c_field_type = _t(field.field_type) field.c_field_const_type = ('' if field.type.nmemb == 1 else 'const ') + field.c_field_type @@ -331,23 +339,22 @@ def _c_type_setup(self, name, postfix): else: self.last_varsized_field = field prev_varsized_field = field - prev_varsized_offset = 0 - - # FIXME - structures with variable sized members, sort out when serialize() is needed + prev_varsized_offset = 0 # as switch does never appear at toplevel, # continue here with type construction if self.is_switch: # special: switch C structs get pointer fields for variable-sized members _c_complex(self) - # declare switch (un)packing functions + # FIXME: declare switch (un)packing functions _c_accessors(self, name, name) - if self.need_serialize: - if not hasattr(self, 'in_reply'): + # 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: _c_serialize(self) - _c_unserialize(self) - + _c_unserialize(self) + finished_serializers.append(self.c_serialize_name) # _c_type_setup() def get_request_fields(self): @@ -360,288 +367,14 @@ 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 unserialize_fields(complex_type, code_lines=[], space='', prefix='', bitcase=False): - prefix_str = prefix - need_padding = False - - if prefix != '': - prefix_str += "->" - if hasattr(complex_type, 'type'): - self = complex_type.type - complex_name = complex_type.name - else: - self = complex_type - complex_name = '_aux' - - if self.is_switch: - switch_expr = _c_accessor_get_expr(self.expr) - need_padding = True - 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)) - unserialize_fields(b.type, code_lines, space="%s " % space, - prefix="%s%s" % (prefix_str, complex_name), bitcase=True) - code_lines.append(' }') - - else: - for field in self.fields: - if not ((field.wire and not field.auto) or field.visible): - continue - - length = "sizeof(%s)" % field.c_field_type - - # 1. fields with fixed size - if field.type.fixed_size(): - need_padding = True - value = ' _aux->%s = (%s) *xcb_tmp;' % (field.c_field_name, field.type.c_type) - # FIXME - lists - - # 2. fields with variable size - else: - #if need_padding: - # unserialize: always calculate padding before variable sized fields - code_lines.append('%s if (0 != xcb_block_len) {' % space) - code_lines.append('%s xcb_block_len += -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;' % space) - code_lines.append('%s xcb_block_len = 0;' % space) - code_lines.append('%s }' % space) - - # FIXME - print("unserialize not yet implemented for variable size fields like %s" % field.c_field_name) - - value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s%s;' % (prefix_str, field.c_field_name) - if field.type.is_list: - # FIXME - list with variable-sized 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)) - length = '%s * sizeof(%s)' % (_c_accessor_get_expr(field.type.expr, prefix), field.type.member.c_wiretype) - elif field.type.is_switch: - # switch is handled by this function as a special case - unserialize_fields(field.type, code_lines, space, prefix="%s%s" % (prefix_str, field.c_field_name)) - 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)' % ('Uh oh', field.type.c_wiretype) - - # save serialization 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 = - 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: - # take account of padding - code_lines.append('%s xcb_block_len = %s;' % (space, length)) - code_lines.append('%s xcb_block_len += -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;' % space) - code_lines.append('%s xcb_block_len = 0;' % space) - - if not bitcase: - code_lines.append('%s xcb_block_len += -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;' % space) - -# 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 - - 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 - count = 0 - # flag to mark wether explicit padding needs to be inserted - need_padding = False - prefix_str = prefix - if prefix != '': - prefix_str += "->" - - if hasattr(complex_type, 'type'): - self = complex_type.type - complex_name = complex_type.name - else: - self = complex_type - complex_name = '_aux' - - def end_block(count): - "end a block => insert padding" - if need_padding and not bitcase: - code_lines.append(' /* padding */') - code_lines.append(' xcb_parts[xcb_parts_idx].iov_base = xcb_pad0;') - code_lines.append(' xcb_pad = -xcb_block_len & 3;') - code_lines.append(' xcb_parts[xcb_parts_idx].iov_len = xcb_pad;') - code_lines.append(' xcb_parts_idx++;') - code_lines.append('') - code_lines.append(' xcb_buffer_len += xcb_pad + %s;' % 'xcb_block_len') - code_lines.append('') - count += 1 - return count - # end_block() - - def insert_padding(count): - code_lines.append('%s /* implicit 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_buffer_len += xcb_block_len + xcb_pad;' % space) - code_lines.append('%s xcb_pad = 0;' % space) - code_lines.append('%s xcb_parts_idx++;' % space) - code_lines.append('%s }' % space) - return count + 1 - # insert_padding() - - # special case - if self.is_switch, all fields need to be serialized conditionally - if self.is_switch: - switch_expr = _c_accessor_get_expr(self.expr) - need_padding = True - - 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(' }') - - else: - for field in self.fields: - value = None - - # sort out invisible fields - if not ((field.wire and not field.auto) or field.visible): - continue - # else - length = "sizeof(%s)" % field.c_field_type - - # 1. fields with fixed size - # fixed size fields are not always handled here, - # dependent on serialize_fixed_size_fields - if field.type.fixed_size() and serialize_fixed_size_fields: - 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: - temp_vars.add(' unsigned int xcb_pad = 0;') - temp_vars.add(' char xcb_pad0[3] = {0, 0, 0};') - 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 - - # 2. fields with variable size - elif not field.type.fixed_size(): - # always calculate padding before variable sized fields - count = insert_padding(count) - code_lines.append('%s xcb_block_len = 0;' % space) - - value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s%s;' % (prefix_str, field.c_field_name) - - if field.type.is_list: - # FIXME - 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)) - length = 'undefined' - # list of variable length with fixed size elements - else: - length = '%s * sizeof(%s)' % (_c_accessor_get_expr(field.type.expr, 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)) - - 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)' % ('Uh oh', field.type.c_wiretype) - - # 3. save serialization C code - if value is not None: - # insert a comment so one can easily trace back to the XML - 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)) - else: - code_lines.append('%s /* %s */' % (space, field.c_field_name)) - - # set xcb_parts[].iov_base and xcb_parts[].iov_len - code_lines.append('%s%s' % (space, value)) - code_lines.append('%s xcb_parts[xcb_parts_idx].iov_len = %s;' % (space, length)) - # increase xcb_parts index - code_lines.append('%s xcb_parts_idx++;' % space) - count += 1 - - # record required memory - if field.type.fixed_size(): - code_lines.append('%s xcb_block_len += %s;' % (space, length)) - else: - # FIXME - count = insert_padding(count) - # raise Exception("obsolete - should not be reached") - # code_lines.append('%s xcb_unpadded = xcb_parts[xcb_parts_idx].iov_len;' % space) - - count = end_block(count) - if count > 0: - temp_vars.add(' unsigned int xcb_parts_idx = 0;') - temp_vars.add(' unsigned int xcb_block_len = 0;') - if need_padding: - temp_vars.add(' unsigned int xcb_pad = 0;') - temp_vars.add(' char xcb_pad0[3] = {0, 0, 0};') - return count -# serialize_fields() - -def _c_switch_aux_params(self): +def get_switch_expr_fields(self): # get the fields referenced by the switch expression def get_expr_fields(expr): if expr.op is None: @@ -665,49 +398,372 @@ def _c_switch_aux_params(self): expr_fields = dict.fromkeys(unresolved_fields) for p in reversed(self.parent): parent_fields = dict((f.field_name, f) for f in p.fields) - if len(unresolved_fields) == 0: - break for f in parent_fields.keys(): if f in unresolved_fields: expr_fields[f] = parent_fields[f] unresolved_fields.remove(f) + if len(unresolved_fields) == 0: + break if None in expr_fields.values(): raise Exception("could not resolve all fields for %s" % self.name) - params = [] - for name, field in expr_fields.iteritems(): - params.append((field, name)) - + params = expr_fields.values() return params -# _c_switch_aux_params() +# get_switch_expr_fields() -def get_serialize_params(self, buffer_var='_buffer', aux_var='_aux', unserialize=False): +def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'): param_fields, wire_fields = get_request_fields(self) if self.is_switch: - switch_params = _c_switch_aux_params(self) - param_fields += [s[0] for s in switch_params] + param_fields = get_switch_expr_fields(self) # _serialize function parameters - params = [('void', '**', buffer_var)] + if 'serialize' == context: + params = [('void', '**', buffer_var)] + elif 'unserialize' == context: + params = [('const void', '*', buffer_var)] + + # 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)) + # parameter fields if any if self.is_switch: - for p in switch_params: - typespec = p[0].c_field_const_type - pointerspec = p[0].c_pointer - params.append((typespec, pointerspec, p[0].c_field_name)) + for p in get_switch_expr_fields(self): + typespec = p.c_field_const_type + pointerspec = p.c_pointer + params.append((typespec, pointerspec, p.c_field_name)) + # aux argument - structure to be serialized - if not unserialize: + if 'serialize' == context: params.append(('const %s' % self.c_type, '*', aux_var)) - else: + elif 'unserialize' == context and self.is_switch: params.append(('%s' % self.c_type, '*', aux_var)) - if not self.is_switch: + 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)) return (param_fields, wire_fields, params) # get_serialize_params() +def _c_field_mapping(context, complex_type): + 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 + # get_prefix() + def get_field_name(fields, complex_type, prefix=''): + for f in complex_type.fields: + if '' == prefix: + prefix = get_prefix(f) + + fname = "%s%s" % (prefix, f.c_field_name) + if fields.has_key(f.field_name): + continue + 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() + + # dict(field_name : (c_field_name, field)) + fields = {} + get_field_name(fields, complex_type) + + # switch: get the fields referenced by the switch expr as well + # these may not belong to any structure + if complex_type.is_switch: + 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): + 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) + + if 'serialize' == context: + 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: + code_lines.append('%s xcb_tmp += 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_block_len = 0;' % space) + + return 1 +# _c_serialize_helper_insert_padding() + +def _c_serialize_helper_switch(context, self, complex_name, + code_lines, temp_vars, + space, prefix): + count = 0 + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + switch_expr = _c_accessor_get_expr(self.expr) + + 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)) + + _c_serialize_helper_fields(context, b.type, + code_lines, temp_vars, + space="%s " % space, + prefix="%s%s" % (prefix_str, complex_name), + is_bitcase = True) + code_lines.append(' }') + + if 'serialize' == context: + 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_buffer_len += xcb_block_len + xcb_pad;' % space) + + return count +# _c_serialize_helper_switch + +def _c_serialize_helper_switch_field(self, field): + # switch is handled by this function as a special case + args = get_switch_expr_fields(field.type) + field_mapping = _c_field_mapping('unserialize', self) + c_field_names = '' + for a in args: + c_field_names += "%s, " % field_mapping[a.field_name][0] + switch_field_name = field_mapping[field.field_name][0] + length = "%s(xcb_tmp, %s&%s)" % (field.type.c_unserialize_name, + c_field_names, switch_field_name) + return length +# _c_serialize_helper_switch_field() + +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 + 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 + # 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(expr, lenfield_prefix) + + # 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: + temp_vars.add(' unsigned int i;') + temp_vars.add(' unsigned int 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) + 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))) + 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 _c_serialize_helper_fields_fixed_size(context, self, field, + code_lines, temp_vars, + space, prefix): + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + code_lines.append('%s /* %s.%s */' % (space, self.c_type, field.c_field_name)) + + length = "sizeof(%s)" % field.c_field_type + + if 'unserialize' == context: + value = ' _aux->%s = *(%s *)xcb_tmp;' % (field.c_field_name, field.c_field_type) + # 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.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 + + return (value, length) +# _c_serialize_helper_fields_fixed_size() + +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) + + if 'unserialize' == context: + value = '' + elif 'serialize' == context: + value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) %s%s;' % (prefix_str, field.c_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: + length = _c_serialize_helper_list_field(context, self, field, + code_lines, temp_vars, + space, prefix) + elif field.type.is_switch: + length = _c_serialize_helper_switch_field(self, field) + else: + length = "%s(xcb_tmp)" % (field.type.c_unserialize_name) + + return (value, length) +# _c_serialize_helper_fields_variable_size + +def _c_serialize_helper_fields(context, self, + code_lines, temp_vars, + space, prefix, is_bitcase): + count = 0 + need_padding = False + prefix_str, lenfield_prefix = _c_serialize_helper_prefix(prefix) + + 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 is_bitcase: + value, length = _c_serialize_helper_fields_fixed_size(context, self, field, + code_lines, temp_vars, + space, 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) + + # 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 + else: + self = complex_type + 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, + code_lines, temp_vars, + space, prefix) + + # 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: + 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) + # "final padding" + count += _c_serialize_helper_insert_padding(context, code_lines, space) + + return count +# _c_serialize_helper() + def _c_serialize(self): _h_setlevel(1) _c_setlevel(1) @@ -719,7 +775,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: @@ -750,32 +806,34 @@ def _c_serialize(self): _c('{') if not self.is_switch: _c(' %s *xcb_out = *_buffer;', self.c_type) - _c(' unsigned int xcb_buffer_len = sizeof(%s);', self.c_type) + _c(' unsigned int xcb_out_pad = -sizeof(%s) & 3;', self.c_type) + _c(' unsigned int xcb_buffer_len = sizeof(%s) + xcb_out_pad;', self.c_type) else: _c(' char *xcb_out = *_buffer;') _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) + count =_c_serialize_helper('serialize', self, + code_lines, temp_vars) # update variable size fields variable_size_fields = count - _c(' struct iovec xcb_parts[%d];', count) + temp_vars.add(' unsigned int xcb_pad = 0;') + temp_vars.add(' char xcb_pad0[3] = {0, 0, 0};') + temp_vars.add(' struct iovec xcb_parts[%d];' % (count+1)) + temp_vars.add(' unsigned int xcb_parts_idx = 0;') + temp_vars.add(' unsigned int xcb_block_len = 0;') + temp_vars.add(' unsigned int i;') + temp_vars.add(' char *xcb_tmp;') for t in temp_vars: _c(t) - _c(' char *xcb_tmp;') - _c(' unsigned int i;') - if not self.is_switch: - _c(' unsigned int xcb_out_pad = -xcb_buffer_len & 3;') - _c(' /* add size of padding */') - _c(' xcb_buffer_len += xcb_out_pad;') _c('') if variable_size_fields > 0: for l in code_lines: _c(l) + _c('') # variable sized fields have been collected, now # allocate memory and copy everything into a continuous memory area @@ -802,9 +860,7 @@ def _c_serialize(self): # variable sized fields _c(' for(i=0; i maxtypelen: - maxtypelen = length + maxtypelen = max(maxtypelen, length) for field in struct_fields: - if field.type.fixed_size(): + 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) + else: - spacing = ' ' * (maxtypelen - (len(field.c_field_type) - 1)) + 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;', self.c_type) @@ -1424,7 +1492,10 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False): _c(' %s xcb_ret;', func_cookie) _c(' %s xcb_out;', self.c_type) for idx, f in enumerate(serial_fields): - _c(' %s xcb_aux%d;', f.type.c_type, idx) + 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) @@ -1455,18 +1526,26 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False): count = 4 for field in param_fields: if not field.type.fixed_size(): - _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name) - if field.type.need_serialize: + if not field.type.need_serialize: + _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name) + else: + if not aux: + _c(' xcb_parts[%d].iov_base = (char *) %s;', count, field.c_field_name) idx = serial_fields.index(field) - serialize_args = get_serialize_params(field.type, - field.c_field_name, - '&xcb_aux%d' % idx, - )[2] + 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) - free_calls.append(' free(xcb_parts[%d].iov_base);' % count) + _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) if field.type.is_list: