X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Fpacket.py;h=93e9ac8f79419d10d21af7d1a707e5dbad7a348e;hb=838a5a5273dc2296b0e08d20e2e0f24183e68b5e;hp=84302fa00c1c6e62b078f32a183898e656be4295;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/packet.py b/bindings/python/bt2/bt2/packet.py
index 84302fa0..93e9ac8f 100644
--- a/bindings/python/bt2/bt2/packet.py
+++ b/bindings/python/bt2/bt2/packet.py
@@ -20,88 +20,28 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from bt2 import native_bt, object, utils
-import bt2.fields
-import bt2.stream
-import copy
-import abc
+from bt2 import native_bt, object
+import bt2.field
 import bt2
 
 
-class _Packet(object._Object):
-    @property
-    def stream(self):
-        stream_ptr = native_bt.packet_get_stream(self._ptr)
-        assert(stream_ptr)
-        return bt2.stream._Stream._create_from_ptr(stream_ptr)
+class _Packet(object._SharedObject):
+    _get_ref = staticmethod(native_bt.packet_get_ref)
+    _put_ref = staticmethod(native_bt.packet_put_ref)
 
     @property
-    def header_field(self):
-        field_ptr = native_bt.packet_get_header(self._ptr)
-
-        if field_ptr is None:
-            return
-
-        return bt2.fields._create_from_ptr(field_ptr)
-
-    @header_field.setter
-    def header_field(self, header_field):
-        header_field_ptr = None
-
-        if header_field is not None:
-            utils._check_type(header_field, bt2.fields._Field)
-            header_field_ptr = header_field._ptr
-
-        ret = native_bt.packet_set_header(self._ptr, header_field_ptr)
-        utils._handle_ret(ret, "cannot set packet object's header field")
+    def stream(self):
+        stream_ptr = native_bt.packet_borrow_stream(self._ptr)
+        assert stream_ptr is not None
+        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     @property
     def context_field(self):
-        field_ptr = native_bt.packet_get_context(self._ptr)
+        field_ptr = native_bt.packet_borrow_context_field(self._ptr)
 
         if field_ptr is None:
             return
 
-        return bt2.fields._create_from_ptr(field_ptr)
-
-    @context_field.setter
-    def context_field(self, context_field):
-        context_field_ptr = None
-
-        if context_field is not None:
-            utils._check_type(context_field, bt2.fields._Field)
-            context_field_ptr = context_field._ptr
-
-        ret = native_bt.packet_set_context(self._ptr, context_field_ptr)
-        utils._handle_ret(ret, "cannot set packet object's context field")
-
-    def __eq__(self, other):
-        if type(other) is not type(self):
-            return False
-
-        if self.addr == other.addr:
-            return True
-
-        self_props = (
-            self.header_field,
-            self.context_field,
-        )
-        other_props = (
-            other.header_field,
-            other.context_field,
-        )
-        return self_props == other_props
-
-    def _copy(self, copy_func):
-        cpy = self.stream.create_packet()
-        cpy.header_field = copy_func(self.header_field)
-        cpy.context_field = copy_func(self.context_field)
-        return cpy
-
-    def __copy__(self):
-        return self._copy(copy.copy)
-
-    def __deepcopy__(self, memo):
-        cpy = self._copy(copy.deepcopy)
-        memo[id(self)] = cpy
-        return cpy
+        return bt2.field._create_field_from_ptr(field_ptr, self._ptr,
+                                                self._get_ref,
+                                                self._put_ref)