Changeset 5953

Timestamp:

Mar 15, 2019 10:22:11 AM (6 years ago)

Author:

ming

Message:

Re #2160: Fixed assertion in pjlib test due to uninitialized ioqueue op keys.

Location:

pjproject/trunk/pjlib/src/pjlib-test

Files:

• ioq_perf.c (modified) (1 diff)
• ioq_tcp.c (modified) (2 diffs)
• ioq_udp.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ioq_perf.c

@@ -281 +281 @@
         /* randomize outgoing buffer. */
         pj_create_random_string(items[i].outgoing_buffer, buffer_size);
+
+        /* Init operation keys. */
+        pj_ioqueue_op_key_init(&items[i].recv_op, sizeof(items[i].recv_op));
+        pj_ioqueue_op_key_init(&items[i].send_op, sizeof(items[i].send_op));
 
         /* Create socket pair. */

pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c

@@ -143 +143 @@
     int pending_op = 0;
     pj_ioqueue_op_key_t read_op, write_op;
+
+    // Init operation keys.
+    pj_ioqueue_op_key_init(&read_op, sizeof(read_op));
+    pj_ioqueue_op_key_init(&write_op, sizeof(write_op));
 
     // Start reading on the server side.
@@ -303 +307 @@
     }
 
+    // Init operation key.
+    pj_ioqueue_op_key_init(&accept_op, sizeof(accept_op));
+
     // Concurrency
     rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);

pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c

@@ -209 +209 @@
     pj_create_random_string(send_buf, bufsize);
 
+    // Init operation keys.
+    pj_ioqueue_op_key_init(&read_op, sizeof(read_op));
+    pj_ioqueue_op_key_init(&write_op, sizeof(write_op));
+
     // Register reading from ioqueue.
     TRACE_("start recvfrom...");
@@ -714 +718 @@
         }
         bytes = bufsize;
+        pj_ioqueue_op_key_init(&inactive_read_op[i],
+                               sizeof(inactive_read_op[i]));
         rc = pj_ioqueue_recv(keys[i], &inactive_read_op[i], recv_buf, &bytes, 0);
         if (rc != PJ_EPENDING) {
@@ -751 +757 @@
         // Randomize send buffer.
         pj_create_random_string(send_buf, bufsize);
+
+        // Init operation keys.
+        pj_ioqueue_op_key_init(&read_op, sizeof(read_op));
+        pj_ioqueue_op_key_init(&write_op, sizeof(write_op));
 
         // Start reading on the server side.