Changeset 89cc0cc

Timestamp:

11/22/18 17:10:50 (4 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

25a3255

Parents:

33b735c

Message:

More assertion cleanups

Location:

lib

Files:

• libtrace.h.in (modified) (6 diffs)
• trace.c (modified) (14 diffs)

lib/libtrace.h.in

@@ -324 +324 @@
         /** Trace err stat **/
         TRACE_ERR_STAT = -20,
+        /** Unable to create deadtrace **/
+        TRACE_ERR_CREATE_DEADTRACE = -21,
 };
 
@@ -1544 +1546 @@
  *
  */
-DLLEXPORT void trace_destroy(libtrace_t *trace);
+DLLEXPORT int trace_destroy(libtrace_t *trace);
 
 /** Close a dummy trace file, freeing up any resources it may have been using
  * @param trace         The dummy trace to be destroyed
  */
-DLLEXPORT void trace_destroy_dead(libtrace_t *trace);
+DLLEXPORT int trace_destroy_dead(libtrace_t *trace);
 
 /** Close an output trace, freeing up any resources it may have been using
  * @param trace         The output trace to be destroyed
  */
-DLLEXPORT void trace_destroy_output(libtrace_out_t *trace);
+DLLEXPORT int trace_destroy_output(libtrace_out_t *trace);
 
 /** Flush an output trace, forcing any buffered packets to be written
@@ -1708 +1710 @@
  */
 DLLEXPORT
-void trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,
+int trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,
                                  libtrace_stat_t *stats);
 
@@ -1742 +1744 @@
  */
 DLLEXPORT
-void trace_subtract_statistics(const libtrace_stat_t *a,
+int trace_subtract_statistics(const libtrace_stat_t *a,
                                const libtrace_stat_t *b, libtrace_stat_t *c);
 
@@ -1754 +1756 @@
  */
 DLLEXPORT
-void trace_add_statistics(const libtrace_stat_t *a,
+int trace_add_statistics(const libtrace_stat_t *a,
                           const libtrace_stat_t *b, libtrace_stat_t *c);
 
@@ -1942 +1944 @@
  */
 DLLEXPORT
-void trace_construct_packet(libtrace_packet_t *packet,
+int trace_construct_packet(libtrace_packet_t *packet,
                 libtrace_linktype_t linktype, const void *data, uint16_t len);
 

lib/trace.c

@@ -731 +731 @@
  *
  */
-DLLEXPORT void trace_destroy(libtrace_t *libtrace) {
+DLLEXPORT int trace_destroy(libtrace_t *libtrace) {
         int i;
 
-        assert(libtrace);
-        //if(!libtrace) {
-        //      return TRACE_ERR_NULL_TRACE;
-        //}
+        /*assert(libtrace);*/
+        if(!libtrace) {
+                return TRACE_ERR_NULL_TRACE;
+        }
 
         ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0);
@@ -758 +758 @@
                 trace_fin_packet(libtrace->last_packet);
         }
-        assert(libtrace->last_packet == NULL);
-        //if (libtrace->last_packet != NULL) {
-        //      trace_set_err(libtrace, TRACE_ERR_PAUSE_FIN, "Unable to remove all data stored against trace in trace_destroy()");
-        //      return -1;
-        //}
+        /*assert(libtrace->last_packet == NULL);*/
+        if (libtrace->last_packet != NULL) {
+                trace_set_err(libtrace, TRACE_ERR_PAUSE_FIN, "Unable to remove all data stored against trace in trace_destroy()");
+                return -1;
+        }
 
         if (libtrace->format) {
@@ -826 +826 @@
 
         free(libtrace);
-}
-
-
-DLLEXPORT void trace_destroy_dead(libtrace_t *libtrace) {
-        assert(libtrace);
-        //if(!libtrace) {
-        //      return TRACE_ERR_NULL_TRACE;
-        //}
+
+        return 0;
+}
+
+
+DLLEXPORT int trace_destroy_dead(libtrace_t *libtrace) {
+        /*assert(libtrace);*/
+        if(!libtrace) {
+                return TRACE_ERR_NULL_TRACE;
+        }
 
         ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0);
@@ -845 +847 @@
                 free(libtrace->format_data);
         free(libtrace);
+
+        return 0;
 }
 /* Close an output trace file, freeing up any resources it may have been using
@@ -850 +854 @@
  * @param libtrace      the output trace file to be destroyed
  */
-DLLEXPORT void trace_destroy_output(libtrace_out_t *libtrace) {
-        assert(libtrace);
-        //if(!libtrace) {
-        //      return TRACE_ERR_NULL_TRACE;
-        //}
+DLLEXPORT int trace_destroy_output(libtrace_out_t *libtrace) {
+        /*assert(libtrace);*/
+        if(!libtrace) {
+                return TRACE_ERR_NULL_TRACE;
+        }
         if (libtrace->format && libtrace->format->fin_output)
                 libtrace->format->fin_output(libtrace);
@@ -860 +864 @@
                 free(libtrace->uridata);
         free(libtrace);
+
+        return 0;
 }
 
@@ -2221 +2227 @@
  */
 DLLEXPORT
-void trace_construct_packet(libtrace_packet_t *packet,
+int trace_construct_packet(libtrace_packet_t *packet,
                 libtrace_linktype_t linktype,
                 const void *data,
-                uint16_t len)
-{
+                uint16_t len) {
+
+        if (!packet) {
+                return TRACE_ERR_NULL_PACKET;
+        }
+
         size_t size;
         static libtrace_t *deadtrace=NULL;
@@ -2255 +2265 @@
 
         /* Now fill in the libtrace packet itself */
-        assert(deadtrace);
+        /*assert(deadtrace);*/
+        if (!deadtrace) {
+                return TRACE_ERR_CREATE_DEADTRACE;
+        }
         packet->trace=deadtrace;
         size=len+sizeof(hdr);
@@ -2278 +2291 @@
 
         trace_clear_cache(packet);
+
+        return 0;
 }
 
@@ -2428 +2443 @@
 }
 
-void trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,
+int trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,
                                  libtrace_stat_t *stat)
 {
-        assert(trace && stat);
-        assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use"
-               "trace_create_statistics() to allocate statistics");
+        /*assert(trace && stat);*/
+        if (!trace) {
+                return TRACE_ERR_NULL_TRACE;
+        }
+        if (!stat) {
+                trace_set_err(trace, TRACE_ERR_STAT, "Stat is NULL trace_get_thread_statistics()");
+                return -1;
+        }
+        /*assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use"
+               "trace_create_statistics() to allocate statistics");*/
+        if (!(stat->magic == LIBTRACE_STAT_MAGIC)) {
+                trace_set_err(trace, TRACE_ERR_STAT,
+                        "Use trace_create_statistics() to allocate statistics in trave_get_thread_statistics()");
+                return -1;
+        }
         stat->reserved1 = 0;
         stat->reserved2 = 0;
@@ -2446 +2473 @@
                 trace->format->get_thread_statistics(trace, t, stat);
         }
-        return;
+
+        return 0;
 }
 
@@ -2464 +2492 @@
 }
 
-void trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,
+int trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,
                          libtrace_stat_t *c) {
-        assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use"
+
+        if (!(a->magic == LIBTRACE_STAT_MAGIC)
+                || !(b->magic == LIBTRACE_STAT_MAGIC)
+                || !(c->magic == LIBTRACE_STAT_MAGIC)) {
+                return TRACE_ERR_STAT;
+        }
+
+        /*assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use"
                "trace_create_statistics() to allocate statistics");
         assert(b->magic == LIBTRACE_STAT_MAGIC && "Please use"
                "trace_create_statistics() to allocate statistics");
         assert(c->magic == LIBTRACE_STAT_MAGIC && "Please use"
-               "trace_create_statistics() to allocate statistics");
+               "trace_create_statistics() to allocate statistics");*/
 
 #define X(x) \
@@ -2482 +2517 @@
         LIBTRACE_STAT_FIELDS
 #undef X
-}
-
-void trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,
+        return 0;
+}
+
+int trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,
                          libtrace_stat_t *c) {
-        assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use"
+        if (!(a->magic == LIBTRACE_STAT_MAGIC)
+                || !(b->magic == LIBTRACE_STAT_MAGIC)
+                || !(c->magic == LIBTRACE_STAT_MAGIC)) {
+                return TRACE_ERR_STAT;
+        }
+
+        /*assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use"
                "trace_create_statistics() to allocate statistics");
         assert(b->magic == LIBTRACE_STAT_MAGIC && "Please use"
                "trace_create_statistics() to allocate statistics");
         assert(c->magic == LIBTRACE_STAT_MAGIC && "Please use"
-               "trace_create_statistics() to allocate statistics");
+               "trace_create_statistics() to allocate statistics");*/
 
 #define X(x) \
@@ -2502 +2544 @@
         LIBTRACE_STAT_FIELDS
 #undef X
+        return 0;
 }