Changeset d7d3267 for lib/format_linux_ring.c

Timestamp:

11/29/18 13:37:20 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

50e9c6b

Parents:

54642da (diff), fdf23b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://github.com/jacobvw/libtrace into jacobvw-master

Conflicts:

lib/format_linux_ring.c

File:

• lib/format_linux_ring.c (modified) (5 diffs)

lib/format_linux_ring.c

@@ -45 +45 @@
 #include <unistd.h>
 #include <string.h>
-#include <assert.h>
 
 #ifdef HAVE_INTTYPES_H
@@ -149 +148 @@
 
         /* In case we have some silly values*/
-        assert(req->tp_block_size);
-        assert(req->tp_block_nr);
-        assert(req->tp_frame_size);
-        assert(req->tp_frame_nr);
-        assert(req->tp_block_size % req->tp_frame_size == 0);
+        if (!req->tp_block_size) {
+                fprintf(stderr, "Unexpected value of zero for req->tp_block_size in calculate_buffers()\n");
+        }
+        if (!req->tp_block_nr) {
+                fprintf(stderr, "Unexpected value of zero for req->tp_block_nr in calculate_buffers()\n");
+        }
+        if (!req->tp_frame_size) {
+                fprintf(stderr, "Unexpected value of zero for req->tp_frame_size in calculate_buffers()\n");
+        }
+        if (!req->tp_frame_nr) {
+                fprintf(stderr, "Unexpected value of zero for req->tp_frame_nr in calculate_buffers()\n");
+        }
+        if (req->tp_block_size % req->tp_frame_size != 0) {
+                fprintf(stderr, "Unexpected value of zero for req->tp_block_size %% req->tp_frame_size in calculate_buffers()\n");
+        }
 }
 
@@ -448 +457 @@
                                            size_t size)
 {
-        assert(packet);
+        if (!packet) {
+                fprintf(stderr, "NULL packet passed into linuxring_set_capture_length()\n");
+                /* Return -1 on error? */
+                return ~0U;
+        }
         if (size > trace_get_capture_length(packet)) {
                 /* We should avoid making a packet larger */
@@ -507 +520 @@
         packet->buf_control = TRACE_CTRL_EXTERNAL;
         packet->type = TRACE_RT_DATA_LINUX_RING;
-        
+
         /* Fetch the current frame */
         header = GET_CURRENT_BUFFER(stream);
         if ((((unsigned long) header) & (pagesize - 1)) != 0) {
-                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
-                        "ring frame size is not a multiple of the page size");
-                return -1;
-        }
+                trace_set_err(libtrace, TRACE_ERR_BAD_IO, "Linux ring packet is not correctly "
+                        "aligned to page size in linux_read_string()");
+                return -1;
+        }
 
         /* TP_STATUS_USER means that we can use the frame.
@@ -677 +690 @@
         if (packet->buffer == NULL)
                 return;
+<<<<<<< HEAD
         if (!libtrace) {
                 return;
         }
+=======
+        if (!packet->trace) {
+                fprintf(stderr, "Linux ring packet is not attached to a valid "
+                        "trace, Unable to release it, in linuxring_fin_packet()\n");
+                return;
+        }
+>>>>>>> fdf23b83dbe8088f53ec27af98ec6ed7b71cc34d
 
         /* If we own the packet (i.e. it's not a copy), we need to free it */