fix rebase

Author: TApplencourt

ze/gen_babeltrace_ze_model.rb

@@ -2,78 +2,6 @@
 require_relative '../utils/gen_babeltrace_model_helper'
 require 'set'
 
-<<<<<<< HEAD
-$integer_sizes = INT_SIZE_MAP.transform_values { |v| v * 8 }
-$integer_signed = INT_SIGN_MAP
-
-def integer_size(t)
-  return 64 if t.match(/\*/)
-
-  r = $integer_sizes[t]
-  raise "unknown integer type #{t}" if r.nil?
-
-  r
-end
-
-def integer_signed?(t)
-  return false if t.match(/\*/)
-
-  r = $integer_signed[t]
-  raise "unknown integer type #{t}" if r.nil?
-
-  r
-end
-
-def meta_parameter_types_name(m, dir)
-  lttng = if dir == :start
-            m.lttng_in_type
-          else
-            m.lttng_out_type
-          end
-  name = lttng.name
-  t = m.command[m.name].type.type
-
-  case m
-  when ScalarMetaParameter
-    if lttng.length
-      [['ctf_integer', 'size_t', "_#{name}_length", nil],
-       [lttng.macro.to_s, "#{t} *", "#{name}", lttng]]
-    else
-      [[lttng.macro.to_s, "#{t}", "#{name}", lttng]]
-    end
-  when ArrayMetaParameter, InString, OutString
-    if lttng.macro.to_s == 'ctf_string'
-      [['ctf_string', "#{t} *", "#{name}", lttng]]
-    else
-      [['ctf_integer', 'size_t', "_#{name}_length", nil],
-       [lttng.macro.to_s, "#{t} *", "#{name}", lttng]]
-    end
-  when OutPtrString
-    [['ctf_string', "#{t}", "#{name}", lttng]]
-  else
-    raise "unsupported meta parameter class #{m.class} #{lttng.call_string} #{t}"
-  end
-end
-
-def get_fields_types_name(c, dir)
-  if dir == :start
-    fields = (c.parameters || []).collect do |p|
-      [p.lttng_type.macro.to_s, p.type.to_s, p.name.to_s, p.lttng_type]
-    end
-    fields += c.meta_parameters.select { |m| m.is_a?(In) }.collect do |m|
-      meta_parameter_types_name(m, :start)
-    end.flatten(1)
-  else
-    r = c.type.lttng_type
-    fields = []
-    fields = [[r.macro.to_s, c.type.to_s, "#{RESULT_NAME}", r]] if r
-    fields += c.meta_parameters.select { |m| m.kind_of?(Out) }.collect { |m|
-      meta_parameter_types_name(m, :stop)
-    end.flatten(1)
-  end
-  fields
-end
-
 event_classes =
   [[:lttng_ust_ze, $ze_commands],
    [:lttng_ust_zet, $zet_commands],