Changeset b606855 for lib

Timestamp:

06/22/17 10:36:26 (4 years ago)

Author:

Richard Sanger <rsanger@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

1105ce0

Parents:

f398c61

Message:

Fixes issue #50 pstop errors/assertions

Pstop was either causing a assertion failure or an error,

when a hasher thread was used.

The assertion failure was due to assertion being out of date.

The error was due to removing trace_interrupt from pstop(),
but still going through the read_packet path.

File:

• lib/trace_parallel.c (modified) (3 diffs)

lib/trace_parallel.c

@@ -805 +805 @@
                                         break;
                                 case MESSAGE_DO_STOP:
+                                        /* Either FINISHED or FINISHING */
                                         assert(trace->started == false);
-                                        assert(trace->state == STATE_FINISHED);
                                         /* Mark the current packet as EOF */
                                         packet->error = 0;
-                                        break;
+                                        goto hasher_eof;
                                 default:
                                         fprintf(stderr, "Hasher thread didn't expect message code=%d\n", message.code);
@@ -850 +850 @@
                 }
         }
-
+hasher_eof:
         /* Broadcast our last failed read to all threads */
         for (i = 0; i < trace->perpkt_thread_count; i++) {
@@ -862 +862 @@
                 ASSERT_RET(pthread_mutex_lock(&trace->libtrace_lock), == 0);
                 if (trace->perpkt_threads[i].state != THREAD_FINISHED) {
-                        // Unlock early otherwise we could deadlock
                         libtrace_ringbuffer_write(&trace->perpkt_threads[i].rbuffer, bcast);
+                } else {
+                        libtrace_ocache_free(&trace->packet_freelist, (void **) &bcast, 1, 1);
                 }
                 ASSERT_RET(pthread_mutex_unlock(&trace->libtrace_lock), == 0);