Changeset 78911b5 for lib


Ignore:
Timestamp:
11/19/14 09:24:50 (6 years ago)
Author:
Dan Collins <djc44@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
9149564
Parents:
fe11d12
Message:

Fixed the debug output to be more clear.
trace_parallel:

  • Changed pausing -> resuming (that never made sense before!)
  • Also removed some large debug output, but that can be reenabled easily

object_cache:

  • There is still a bug, but I added new lines to make it look nicer
Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/data-struct/object_cache.c

    r957a72a r78911b5  
    226226        // Make sure we haven't lost too many packets
    227227        if (oc->current_allocations)
    228                 fprintf(stderr, "!!OCache closing lost, %d packets!!", (int) oc->current_allocations);
     228                fprintf(stderr, "!!OCache closing lost, %d packets!!\n", (int) oc->current_allocations);
    229229        else
    230                 fprintf(stderr, "!!OCache closing lost, %d packets!!", (int) oc->current_allocations);
     230                /* This is clearly a bug, but I don't know what to replace it with... */
     231                fprintf(stderr, "!!OCache closing lost, %d packets!!\n", (int) oc->current_allocations);
    231232        libtrace_ringbuffer_destroy(&oc->rb);
    232233        pthread_spin_destroy(&oc->spin);
  • lib/trace_parallel.c

    rf9ba82f r78911b5  
    124124
    125125static void print_memory_stats() {
     126#if 0
    126127        char t_name[50];
    127128        uint64_t total;
     
    165166                                total, (double) mem_hits.writebulk.miss / (double) total * 100.0);
    166167        }
    167 
     168#endif
    168169}
    169170
     
    13371338        assert(packet);
    13381339
    1339         if (libtrace->format->read_packet) {
     1340        if (libtrace->format->pread_packet) {
    13401341                do {
    13411342                        size_t ret;
     
    21982199        assert(str);
    21992200        assert(uc);
    2200         printf ("Splitting string \"%s\" into tokens:\n",str);
    22012201        pch = strtok (str," ,.-");
    22022202        while (pch != NULL)
Note: See TracChangeset for help on using the changeset viewer.