X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fgraph.py;h=82708025c19032b91c72b063d977567b95ca4995;hb=0530003ff4f693e0a582a0ed4a15245455398b4a;hp=6c9db7ec96a24b4e97d4b44c993fc2c2a6100514;hpb=253a9ecc0641040e126ea2ed31c1183aa5d1276c;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/graph.py b/src/bindings/python/bt2/bt2/graph.py index 6c9db7ec..82708025 100644 --- a/src/bindings/python/bt2/bt2/graph.py +++ b/src/bindings/python/bt2/bt2/graph.py @@ -33,10 +33,10 @@ import bt2 def _graph_port_added_listener_from_native( user_listener, component_ptr, component_type, port_ptr, port_type ): - component = bt2_component._create_component_from_ptr_and_get_ref( + component = bt2_component._create_component_from_const_ptr_and_get_ref( component_ptr, component_type ) - port = bt2_port._create_from_ptr_and_get_ref(port_ptr, port_type) + port = bt2_port._create_from_const_ptr_and_get_ref(port_ptr, port_type) user_listener(component, port) @@ -49,16 +49,16 @@ def _graph_ports_connected_listener_from_native( downstream_component_type, downstream_port_ptr, ): - upstream_component = bt2_component._create_component_from_ptr_and_get_ref( + upstream_component = bt2_component._create_component_from_const_ptr_and_get_ref( upstream_component_ptr, upstream_component_type ) - upstream_port = bt2_port._create_from_ptr_and_get_ref( + upstream_port = bt2_port._create_from_const_ptr_and_get_ref( upstream_port_ptr, native_bt.PORT_TYPE_OUTPUT ) - downstream_component = bt2_component._create_component_from_ptr_and_get_ref( + downstream_component = bt2_component._create_component_from_const_ptr_and_get_ref( downstream_component_ptr, downstream_component_type ) - downstream_port = bt2_port._create_from_ptr_and_get_ref( + downstream_port = bt2_port._create_from_const_ptr_and_get_ref( downstream_port_ptr, native_bt.PORT_TYPE_INPUT ) user_listener( @@ -91,15 +91,15 @@ class Graph(object._SharedObject): obj=None, logging_level=bt2_logging.LoggingLevel.NONE, ): - if isinstance(component_class, bt2_component._SourceComponentClass): + if isinstance(component_class, bt2_component._SourceComponentClassConst): cc_ptr = component_class._ptr add_fn = native_bt.bt2_graph_add_source_component cc_type = native_bt.COMPONENT_CLASS_TYPE_SOURCE - elif isinstance(component_class, bt2_component._FilterComponentClass): + elif isinstance(component_class, bt2_component._FilterComponentClassConst): cc_ptr = component_class._ptr add_fn = native_bt.bt2_graph_add_filter_component cc_type = native_bt.COMPONENT_CLASS_TYPE_FILTER - elif isinstance(component_class, bt2_component._SinkComponentClass): + elif isinstance(component_class, bt2_component._SinkComponentClassConst): cc_ptr = component_class._ptr add_fn = native_bt.bt2_graph_add_sink_component cc_type = native_bt.COMPONENT_CLASS_TYPE_SINK @@ -137,17 +137,17 @@ class Graph(object._SharedObject): ) utils._handle_func_status(status, 'cannot add component to graph') assert comp_ptr - return bt2_component._create_component_from_ptr(comp_ptr, cc_type) + return bt2_component._create_component_from_const_ptr(comp_ptr, cc_type) def connect_ports(self, upstream_port, downstream_port): - utils._check_type(upstream_port, bt2_port._OutputPort) - utils._check_type(downstream_port, bt2_port._InputPort) + utils._check_type(upstream_port, bt2_port._OutputPortConst) + utils._check_type(downstream_port, bt2_port._InputPortConst) status, conn_ptr = native_bt.graph_connect_ports( self._ptr, upstream_port._ptr, downstream_port._ptr ) utils._handle_func_status(status, 'cannot connect component ports within graph') assert conn_ptr - return bt2_connection._Connection._create_from_ptr(conn_ptr) + return bt2_connection._ConnectionConst._create_from_ptr(conn_ptr) def add_port_added_listener(self, listener): if not callable(listener):