Changeset b6ff245

Timestamp:

11/27/18 11:30:32 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

1ed3f1e

Parents:

0a474e3

Message:

cleanup

Location:

lib

Files:

• data-struct/object_cache.c (modified) (2 diffs)
• format_dag25.c (modified) (2 diffs)
• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (1 diff)

lib/data-struct/object_cache.c

@@ -145 +145 @@
         /*assert (lcs->t_mem_caches_total > 0);*/
         if (lcs->t_mem_caches_total <= 0) {
-
+                fprintf(stderr, "Expected lcs->t_mem_caches_total to be greater or equal to 0 in resize_memory_caches()\n");
+                return;
         }
         lcs->t_mem_caches += 0x10;
@@ -267 +268 @@
         /*assert(buffer_size);*/
         if (!buffer_size) {
-                fprintf(stderr, "NULL bugger_size passed into libtrace_ocache_init()\n");
+                fprintf(stderr, "NULL buffer_size passed into libtrace_ocache_init()\n");
                 return -1;
         }

lib/format_dag25.c

@@ -1522 +1522 @@
         }
         if (!stat) {
-                trace_set_err, TRACE_ERR_STAT, "NULL stat passed into dag_get_statistics()");
+                trace_set_err(libtrace, TRACE_ERR_STAT, "NULL stat passed into dag_get_statistics()");
                 return;
         }
@@ -1546 +1546 @@
         }
         if (!stat) {
-                trace_set_err, TRACE_ERR_STAT, "NULL stat passed into dag_get_thread_statistics()");
+                trace_set_err(libtrace, TRACE_ERR_STAT, "NULL stat passed into dag_get_thread_statistics()");
                 return;
         }

lib/trace.c

@@ -1009 +1009 @@
 
         if (trace_is_err(libtrace))
-                /*trace_set_err(libtrace, TRACE_ERR_BAD_STATE, "Trace is in an error state trace_read_packet()");*/
                 return -1;
 

lib/trace_parallel.c

@@ -2517 +2517 @@
         res.key = key;
         res.value = value;
-        assert(libtrace->combiner.publish);
+        /*assert(libtrace->combiner.publish);*/
+        if (!libtrace->combiner.publish) {
+                fprintf(stderr, "Unable to publish result in trace_publish_result()\n");
+                return;
+        }
         libtrace->combiner.publish(libtrace, t->perpkt_num, &libtrace->combiner, &res);
         return;