- Timestamp:
- 11/26/18 16:50:48 (2 years ago)
- Branches:
- develop
- Children:
- 88b9798
- Parents:
- 2ceec6a
- Location:
- lib
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/combiner_ordered.c
ree6e802 rf6f3ae5 36 36 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) { 37 37 int i = 0; 38 assert(trace_get_perpkt_threads(t) > 0); 38 /*assert(trace_get_perpkt_threads(t) > 0);*/ 39 if (trace_get_perpkt_threads(t) <= 0) { 40 trace_set_err(t, TRACE_ERR_INIT_FAILED, "You must have atleast 1 processing thread"); 41 return -1; 42 } 39 43 libtrace_queue_t *queues; 40 44 c->queues = calloc(sizeof(libtrace_queue_t), trace_get_perpkt_threads(t)); … … 245 249 246 250 for (i = 0; i < trace_get_perpkt_threads(trace); i++) { 247 assert(libtrace_deque_get_size(&queues[i]) == 0); 251 /*assert(libtrace_deque_get_size(&queues[i]) == 0);*/ 252 if (libtrace_deque_get_size(&queues[i]) != 0) { 253 trace_set_err(trace, TRACE_ERR_COMBINER, 254 "Failed to destory queues, A thread still has data in destroy()"); 255 return; 256 } 248 257 } 249 258 free(queues); -
lib/combiner_sorted.c
ree6e802 rf6f3ae5 34 34 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) { 35 35 int i = 0; 36 assert(trace_get_perpkt_threads(t) > 0); 36 /*assert(trace_get_perpkt_threads(t) > 0);*/ 37 if (trace_get_perpkt_threads(t) <= 0) { 38 trace_set_err(t, TRACE_ERR_INIT_FAILED, "You must have atleast 1 processing thread"); 39 return -1; 40 } 37 41 libtrace_vector_t *queues; 38 42 c->queues = calloc(sizeof(libtrace_vector_t), trace_get_perpkt_threads(t)); … … 105 109 106 110 for (i = 0; i < trace_get_perpkt_threads(trace); i++) { 107 assert(libtrace_vector_get_size(&queues[i]) == 0); 111 /*assert(libtrace_vector_get_size(&queues[i]) == 0);*/ 112 if (libtrace_vector_get_size(&queues[i]) != 0) { 113 trace_set_err(trace, TRACE_ERR_COMBINER, 114 "Failed to destory queues, A thread still has data in destroy()"); 115 return; 116 } 108 117 libtrace_vector_destroy(&queues[i]); 109 118 } -
lib/combiner_unordered.c
ree6e802 rf6f3ae5 34 34 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) { 35 35 int i = 0; 36 assert(trace_get_perpkt_threads(t) > 0); 36 /*assert(trace_get_perpkt_threads(t) > 0);*/ 37 if (trace_get_perpkt_threads(t) <= 0) { 38 trace_set_err(t, TRACE_ERR_INIT_FAILED, "You must have atleast 1 processing thread"); 39 return -1; 40 } 37 41 libtrace_queue_t *queues; 38 42 c->queues = calloc(sizeof(libtrace_queue_t), trace_get_perpkt_threads(t)); … … 87 91 88 92 for (i = 0; i < trace_get_perpkt_threads(trace); i++) { 89 assert(libtrace_deque_get_size(&queues[i]) == 0); 93 /*assert(libtrace_deque_get_size(&queues[i]) == 0);*/ 94 if (libtrace_deque_get_size(&queues[i]) != 0) { 95 trace_set_err(trace, TRACE_ERR_COMBINER, 96 "Failed to destroy queues, A thread still has data in destroy()"); 97 return; 98 } 90 99 } 91 100 free(queues); -
lib/format_dag24.c
r2725318 rf6f3ae5 326 326 return NULL; 327 327 size = ntohs(erfptr->rlen); 328 assert( size >= dag_record_size ); 328 /*assert( size >= dag_record_size );*/ 329 if (size < dag_record_size) { 330 fprintf(stderr, "Incorrect dag record size in dag_get_record()\n"); 331 return NULL; 332 } 329 333 FORMAT_DATA->offset += size; 330 334 FORMAT_DATA->diff -= size; … … 482 486 483 487 /* We only want to sleep for a very short time */ 484 assert(data == 0); 488 /*assert(data == 0);*/ 489 if (!data != 0) { 490 trace_set_err(trace, TRACE_ERR_BAD_PACKET, "Unexpected data from trace event in trace_event_dag()"); 491 return NULL; 492 } 485 493 event.type = TRACE_EVENT_SLEEP; 486 494 event.seconds = 0.0001; -
lib/format_dag25.c
r2725318 rf6f3ae5 245 245 FORMAT_DATA->per_stream = 246 246 libtrace_list_init(sizeof(stream_data)); 247 assert(FORMAT_DATA->per_stream != NULL); 247 /*assert(FORMAT_DATA->per_stream != NULL);*/ 248 if (FORMAT_DATA->per_stream == NULL) { 249 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, 250 "Unable to create list for stream in dag_init_format_data()"); 251 return -1; 252 } 248 253 249 254 /* We'll start with just one instance of stream_data, and we'll … … 284 289 { 285 290 /* Need to remove from the device list */ 286 assert(dev->ref_count == 0); 291 /*assert(dev->ref_count == 0);*/ 292 if (dev->ref_count != 0) { 293 fprintf(stderr, "Cannot close DAG device with non zero reference in dag_close_device()\n"); 294 return; 295 } 287 296 288 297 if (dev->prev == NULL) { … … 996 1005 997 1006 size = ntohs(erfptr->rlen); 998 assert( size >= dag_record_size ); 1007 /*assert( size >= dag_record_size );*/ 1008 if (size < dag_record_size) { 1009 fprintf(stderr, "Incorrect dag record size in dag_get_record()\n"); 1010 return NULL; 1011 } 999 1012 1000 1013 /* Make certain we have the full packet available */ … … 1226 1239 1227 1240 /* Packet length (rlen includes format overhead) */ 1228 assert(trace_get_capture_length(packet) > 0 1229 && trace_get_capture_length(packet) <= 65536); 1230 assert(erf_get_framing_length(packet) > 0 1231 && trace_get_framing_length(packet) <= 65536); 1232 assert(trace_get_capture_length(packet) + 1241 /*assert(trace_get_capture_length(packet) > 0 1242 && trace_get_capture_length(packet) <= 65536);*/ 1243 if (!(trace_get_capture_length(packet) > 0 1244 && trace_get_capture_length(packet) <= 65536)) { 1245 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, 1246 "Capture length is out of range in dag_write_packet()"); 1247 return -1; 1248 } 1249 /*assert(erf_get_framing_length(packet) > 0 1250 && trace_get_framing_length(packet) <= 65536);*/ 1251 if (!(erf_get_framing_length(packet) > 0 1252 && trace_get_framing_length(packet) <= 65536)) { 1253 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, 1254 "Framing length is out of range in dag_write_packet()"); 1255 return -1; 1256 } 1257 /*assert(trace_get_capture_length(packet) + 1233 1258 erf_get_framing_length(packet) > 0 1234 1259 && trace_get_capture_length(packet) + 1235 erf_get_framing_length(packet) <= 65536); 1260 erf_get_framing_length(packet) <= 65536);*/ 1261 if (!(trace_get_capture_length(packet) + 1262 erf_get_framing_length(packet) > 0 1263 && trace_get_capture_length(packet) + 1264 erf_get_framing_length(packet) <= 65536)) { 1265 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, 1266 "Capture + framing length is out of range in dag_write_packet()"); 1267 return -1; 1268 } 1236 1269 1237 1270 erfhdr.rlen = htons(trace_get_capture_length(packet) … … 1483 1516 { 1484 1517 libtrace_list_node_t *tmp; 1485 assert(stat && libtrace); 1518 /*assert(stat && libtrace);*/ 1519 if (!libtrace) { 1520 fprintf(stderr, "NULL trace passed into dag_get_statistics()\n"); 1521 return; 1522 } 1523 if (!stat) { 1524 trace_set_err, TRACE_ERR_STAT, "NULL stat passed into dag_get_statistics()"); 1525 return; 1526 } 1486 1527 tmp = FORMAT_DATA_HEAD; 1487 1528 … … 1499 1540 libtrace_stat_t *stat) { 1500 1541 struct dag_per_stream_t *stream_data = t->format_data; 1501 assert(stat && libtrace); 1502 1542 /*assert(stat && libtrace);*/ 1543 if (!libtrace) { 1544 fprintf(stderr, "NULL trace passed into dag_get_thread_statistics()\n"); 1545 return; 1546 } 1547 if (!stat) { 1548 trace_set_err, TRACE_ERR_STAT, "NULL stat passed into dag_get_thread_statistics()"); 1549 return; 1550 } 1503 1551 stat->dropped_valid = 1; 1504 1552 stat->dropped = stream_data->drops; -
lib/format_duck.c
r2725318 rf6f3ae5 112 112 return -1; 113 113 } 114 assert(0); 114 /*assert(0);*/ 115 trace_set_err_out(libtrace, TRACE_ERR_UNKNOWN_OPTION, 116 "Unknown option in duck_config_output()"); 117 return -1; 115 118 } 116 119 … … 243 246 244 247 if (duck_prepare_packet(libtrace, packet, packet->buffer, packet->type, 245 flags)) 246 return -1; 247 248 flags)) 249 return -1; 250 248 251 return numbytes; 249 252 } 250 253 251 static int duck_write_packet(libtrace_out_t *libtrace, 252 libtrace_packet_t *packet) 254 static int duck_write_packet(libtrace_out_t *libtrace, 255 libtrace_packet_t *packet) 253 256 { 254 257 … … 256 259 uint32_t duck_version; 257 260 258 if (packet->type != TRACE_RT_DUCK_2_4 261 if (packet->type != TRACE_RT_DUCK_2_4 259 262 && packet->type != TRACE_RT_DUCK_2_5 && 260 263 packet->type != TRACE_RT_DUCK_5_0) { … … 263 266 return -1; 264 267 } 265 266 assert(OUTPUT->file); 268 269 /*assert(OUTPUT->file);*/ 270 if (!OUTPUT->file) { 271 trace_set_err_out(libtrace, TRACE_ERR_BAD_IO, 272 "Call init_output before write_packets() in duck_write_packet()"); 273 return -1; 274 } 267 275 268 276 if (OUTPUT->dag_version == 0) { … … 271 279 if ((numbytes = wandio_wwrite(OUTPUT->file, &duck_version, 272 280 sizeof(duck_version))) != sizeof(uint32_t)){ 273 trace_set_err_out(libtrace, errno, 281 trace_set_err_out(libtrace, errno, 274 282 "Writing DUCK version failed"); 275 283 return -1; … … 277 285 OUTPUT->dag_version = packet->type; 278 286 } 279 280 if ((numbytes = wandio_wwrite(OUTPUT->file, packet->payload, 287 288 if ((numbytes = wandio_wwrite(OUTPUT->file, packet->payload, 281 289 trace_get_capture_length(packet))) != 282 290 (int)trace_get_capture_length(packet)) { -
lib/format_erf.c
r2725318 rf6f3ae5 180 180 exthdr ++; 181 181 firstbyte = (uint8_t *)exthdr; 182 assert(extsize <= ntohs(erfptr->rlen)); 182 /*assert(extsize <= ntohs(erfptr->rlen));*/ 183 if (extsize > ntohs(erfptr->rlen)) { 184 trace_set_err(packet->trace, TRACE_ERR_BAD_PACKET, "Extension size is greater than dag record record length in erf_get_framing_length()"); 185 return -1; 186 } 183 187 } 184 188 } … … 384 388 break; 385 389 case INDEX_UNKNOWN: 386 assert(0); 390 /*assert(0);*/ 391 trace_set_err(libtrace, TRACE_ERR_SEEK_ERF, "Cannot seek to erf timestamp with unknown index in erf_seek_erf()"); 392 return -1; 387 393 break; 388 394 } … … 481 487 } 482 488 483 assert(erfptr->rlen != 0); 484 489 /*assert(erfptr->rlen != 0);*/ 490 if (erfptr->rlen == 0) { 491 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Packet is empty in erf_prepare_packet()\n"); 492 return -1; 493 } 494 485 495 if (libtrace->format_data == NULL) { 486 496 /* Allocates the format_data structure */ … … 658 668 void *payload = packet->payload; 659 669 660 assert(OUTPUT->file); 670 /*assert(OUTPUT->file);*/ 671 if (!OUTPUT->file) { 672 trace_set_err_out(libtrace, TRACE_ERR_BAD_IO, "Call init_output before write_packet() in erf_write_packet()"); 673 return -1; 674 } 661 675 662 676 if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA) … … 708 722 709 723 /* Packet length (rlen includes format overhead) */ 710 assert(trace_get_capture_length(packet)>0 711 && trace_get_capture_length(packet)<=65536); 712 assert(trace_get_framing_length(packet)<=65536); 713 724 /*assert(trace_get_capture_length(packet)>0 725 && trace_get_capture_length(packet)<=65536);*/ 726 if (!(trace_get_capture_length(packet) > 0 727 && trace_get_capture_length(packet) <= 65536)) { 728 trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET, 729 "Capture length is out of range in erf_write_packet()"); 730 return -1; 731 } 732 /*assert(trace_get_framing_length(packet)<=65536);*/ 733 if (trace_get_framing_length(packet) > 65536) { 734 trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET, 735 "Framing length is to large in erf_write_packet()"); 736 return -1; 737 } 738 714 739 if (erfhdr.type == TYPE_ETH) 715 740 framing = dag_record_size + 2; 716 741 else 717 742 framing = dag_record_size; 718 743 719 744 rlen = trace_get_capture_length(packet) + framing; 720 assert(rlen > 0 && rlen <= 65536); 745 /*assert(rlen > 0 && rlen <= 65536);*/ 746 if (!(rlen > 0 && rlen <= 65536)) { 747 trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET, 748 "Capture + framing length is out of range in erf_write_packet()"); 749 return -1; 750 } 721 751 erfhdr.rlen = htons(rlen); 722 752 /* loss counter. Can't do this */ … … 806 836 uint16_t wlen; 807 837 808 assert(packet); 838 /*assert(packet);*/ 839 if (!packet) { 840 fprintf(stderr, "NULL packet passed to erf_set_capture_length()\n"); 841 return ~0U; 842 } 809 843 erfptr = (dag_record_t *)packet->header; 810 844 -
lib/format_etsilive.c
r2725318 rf6f3ae5 595 595 libtrace_t *libtrace = packet->trace; 596 596 597 assert(libtrace); 598 assert(FORMAT_DATA->shareddec); 597 /*assert(libtrace);*/ 598 if (!libtrace) { 599 fprintf(stderr, "Packet is not associated with a trace in etsilive_get_pdu_length()\n"); 600 return TRACE_ERR_NULL_TRACE; 601 } 602 /*assert(FORMAT_DATA->shareddec);*/ 603 if (!FORMAT_DATA->shareddec) { 604 trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT, "Etsilive format data shareddec is NULL in etsilive_get_pdu_length()\n"); 605 return -1; 606 } 599 607 600 608 /* 0 should be ok here for quickly evaluating the first length -
lib/format_helper.c
r25a3255 rf6f3ae5 72 72 if (!trace) { 73 73 fprintf(stderr, "NULL trace passed into trace_event_device()\n"); 74 return; 74 /* Return empty event on error? */ 75 return event; 75 76 } 76 77 /*assert(packet != NULL);*/ 77 78 if (!packet) { 78 79 trace_set_err(trace, TRACE_ERR_NULL_PACKET, "NULL packet passed into trace_event_device()"); 79 return; 80 /* Return empty event on error? */ 81 return event; 80 82 } 81 83 -
lib/format_linux_int.c
r25a3255 rf6f3ae5 454 454 if (!packet) { 455 455 fprintf(stderr, "NULL packet passed into linuxnative_set_capture_length()\n"); 456 return; 456 /* Return -1 on error? */ 457 return ~0U; 457 458 } 458 459 if (size > trace_get_capture_length(packet)) { -
lib/format_linux_ring.c
r25a3255 rf6f3ae5 167 167 /*assert(req->tp_block_size % req->tp_frame_size == 0);*/ 168 168 if (req->tp_block_size % req->tp_frame_size != 0) { 169 fprintf(stderr, "Unexpected value req->tp_block_size % req->tp_frame_size in calculate_buffers()\n");169 fprintf(stderr, "Unexpected value req->tp_block_size %% req->tp_frame_size in calculate_buffers()\n"); 170 170 } 171 171 } … … 466 466 if (!packet) { 467 467 fprintf(stderr, "NULL packet passed into linuxring_set_capture_length()\n"); 468 return; 468 /* Return -1 on error? */ 469 return ~0U; 469 470 } 470 471 if (size > trace_get_capture_length(packet)) { -
lib/format_pcap.c
r25a3255 rf6f3ae5 779 779 /*assert(trace->format_data);*/ 780 780 if (!trace->format_data) { 781 trace_set_err(trace, TRACE_ERR_BAD_FORMAT, "Trace format data missing, call init_input() before calling pcap_get_fd()"); 782 return -1; 781 /* cant do this because trace is a const? */ 782 /*trace_set_err(trace, TRACE_ERR_BAD_FORMAT, "Trace format data missing, call init_input() before calling pcap_get_fd()");*/ 783 fprintf(stderr, "Trace format data missing, call init_input() before calling pcap_get_fd()\n"); 784 return TRACE_ERR_BAD_FORMAT; 783 785 } 784 786 return pcap_fileno(DATA(trace)->input.pcap); -
lib/format_pcapfile.c
r25a3255 rf6f3ae5 576 576 if (!packet) { 577 577 fprintf(stderr, "NULL packet passed to pcapfile_get_timeval()\n"); 578 return; 578 /* Return default timeval on error? */ 579 return ts; 579 580 } 580 581 /*assert(packet->header);*/ 581 582 if (!packet->header) { 582 583 trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_timeval()"); 583 return; 584 /* Return default timeval on error? */ 585 return ts; 584 586 } 585 587 … … 602 604 if (!packet) { 603 605 fprintf(stderr, "NULL packet passed to pcapfile_get_timespec()"); 604 return; 606 /* Return default timespec on error? */ 607 return ts; 605 608 } 606 609 /*assert(packet->header);*/ 607 610 if (!packet->header) { 608 611 trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_timespec()"); 609 return; 612 /* Return fefault timespec on error? */ 613 return ts; 610 614 } 611 615 … … 691 695 if (!packet) { 692 696 fprintf(stderr, "NULL packet passed into pcapfile_set_capture_length\n"); 693 return; 697 /* Return -1 on error? */ 698 return ~0U; 694 699 } 695 700 /*assert(packet->header);*/ 696 701 if (!packet->header) { 697 702 trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_set_capture_length()"); 698 return; 703 /* Return -1 on error? */ 704 return ~0U; 699 705 } 700 706 if (size > trace_get_capture_length(packet)) { -
lib/format_pcapng.c
r25a3255 rf6f3ae5 1118 1118 if (!packet) { 1119 1119 fprintf(stderr, "NULL packet passed into pcapng_get_timespec()"); 1120 return; 1120 /* Return default timespec on error? */ 1121 return ts; 1121 1122 } 1122 1123 /*assert(packet->header);*/ 1123 1124 if (!packet->header) { 1124 1125 trace_set_err(packet->trace, TRACE_ERR_BAD_PACKET, "NULL header in packet in pcapng_get_timespec()"); 1125 return; 1126 /* Return default timespec on error? */ 1127 return ts; 1126 1128 } 1127 1129 -
lib/format_rt.c
r25a3255 rf6f3ae5 763 763 if (!trace) { 764 764 fprintf(stderr, "NULL trace passed into trace_event_rt()\n"); 765 return; 765 /* Return empty event on error? */ 766 return event; 766 767 } 767 768 /*assert(packet);*/ 768 769 if (!packet) { 769 770 trace_set_err(trace, TRACE_ERR_NULL_PACKET, "NULL packet passed into trace_event_rt()"); 770 return; 771 /* Return empty event on error? */ 772 return event; 771 773 } 772 774 -
lib/libtrace.h.in
r25a3255 rf6f3ae5 322 322 /** Buffer is NULL **/ 323 323 TRACE_ERR_NULL_BUFFER = -19, 324 /** Trace err stat**/324 /** Trace stats err **/ 325 325 TRACE_ERR_STAT = -20, 326 326 /** Unable to create deadtrace **/ … … 332 332 /** Trace has bad header **/ 333 333 TRACE_ERR_BAD_HEADER = -24, 334 /** Trace err seeking by erf **/ 335 TRACE_ERR_SEEK_ERF = -25, 336 /** Trace err combiner **/ 337 TRACE_ERR_COMBINER = -26, 338 /** Error pausing processing thread **/ 339 TRACE_ERR_PAUSE_PTHREAD = -27, 340 /** Error with trace thread **/ 341 TRACE_ERR_THREAD = -28, 342 /** Thread in unexpecting state **/ 343 TRACE_ERR_THREAD_STATE = -29, 344 /** Trace configuration error **/ 345 TRACE_ERR_CONFIG = -30, 346 /** NULL passed misc **/ 347 TRACE_ERR_NULL = -31, 334 348 }; 335 349 … … 1717 1731 */ 1718 1732 DLLEXPORT 1719 inttrace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,1733 void trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t, 1720 1734 libtrace_stat_t *stats); 1721 1735 … … 1751 1765 */ 1752 1766 DLLEXPORT 1753 inttrace_subtract_statistics(const libtrace_stat_t *a,1767 void trace_subtract_statistics(const libtrace_stat_t *a, 1754 1768 const libtrace_stat_t *b, libtrace_stat_t *c); 1755 1769 … … 1763 1777 */ 1764 1778 DLLEXPORT 1765 inttrace_add_statistics(const libtrace_stat_t *a,1779 void trace_add_statistics(const libtrace_stat_t *a, 1766 1780 const libtrace_stat_t *b, libtrace_stat_t *c); 1767 1781 … … 1951 1965 */ 1952 1966 DLLEXPORT 1953 inttrace_construct_packet(libtrace_packet_t *packet,1967 void trace_construct_packet(libtrace_packet_t *packet, 1954 1968 libtrace_linktype_t linktype, const void *data, uint16_t len); 1955 1969 -
lib/protocols_ospf.c
r25a3255 rf6f3ae5 190 190 if (!as_lsa) { 191 191 fprintf(stderr, "NULL as_lsa passed into trace_get_ospf_metric_from_as_external_lsa_v2()\n"); 192 return; 192 /* Return metric of 0 on error? */ 193 return metric; 193 194 } 194 195 … … 208 209 if (!sum_lsa) { 209 210 fprintf(stderr, "NULL sum_lsa passed into trace_get_ospf_metric_from_summary_lsa_v2()\n"); 210 return; 211 /* Return metric of 0 on error? */ 212 return metric; 211 213 } 212 214 -
lib/trace.c
r25a3255 rf6f3ae5 1528 1528 if (!trace) { 1529 1529 fprintf(stderr, "NULL trace passed into trace_event()"); 1530 return; 1530 /* Return default event on error? */ 1531 return event; 1531 1532 } 1532 1533 /*assert(packet && "You called trace_event() with a NULL packet object!");*/ 1533 1534 if (!packet) { 1534 1535 trace_set_err(trace, TRACE_ERR_NULL_PACKET, "NULL packet passed into trace_event()"); 1535 return; 1536 /* Return default event on error? */ 1537 return event; 1536 1538 } 1537 1539 … … 2248 2250 */ 2249 2251 DLLEXPORT 2250 inttrace_construct_packet(libtrace_packet_t *packet,2252 void trace_construct_packet(libtrace_packet_t *packet, 2251 2253 libtrace_linktype_t linktype, 2252 2254 const void *data, 2253 2255 uint16_t len) { 2254 2255 if (!packet) {2256 return TRACE_ERR_NULL_PACKET;2257 }2258 2256 2259 2257 size_t size; … … 2289 2287 if (!deadtrace) { 2290 2288 fprintf(stderr, "Unable to create dead trace trace_construct_packet()\n"); 2291 return TRACE_ERR_CREATE_DEADTRACE;2289 return; 2292 2290 } 2293 2291 packet->trace=deadtrace; … … 2313 2311 2314 2312 trace_clear_cache(packet); 2315 2316 return 0;2317 2313 } 2318 2314 … … 2491 2487 } 2492 2488 2493 inttrace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,2489 void trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t, 2494 2490 libtrace_stat_t *stat) 2495 2491 { … … 2497 2493 if (!trace) { 2498 2494 fprintf(stderr, "NULL trace passed into trace_get_thread_statistics()\n"); 2499 return TRACE_ERR_NULL_TRACE;2495 return; 2500 2496 } 2501 2497 if (!stat) { 2502 2498 trace_set_err(trace, TRACE_ERR_STAT, "Stat is NULL trace_get_thread_statistics()"); 2503 return -1;2499 return; 2504 2500 } 2505 2501 /*assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use" … … 2508 2504 trace_set_err(trace, TRACE_ERR_STAT, 2509 2505 "Use trace_create_statistics() to allocate statistics in trace_get_thread_statistics()"); 2510 return -1;2506 return; 2511 2507 } 2512 2508 stat->reserved1 = 0; … … 2522 2518 trace->format->get_thread_statistics(trace, t, stat); 2523 2519 } 2524 2525 return 0;2526 2520 } 2527 2521 … … 2541 2535 } 2542 2536 2543 inttrace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,2537 void trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2544 2538 libtrace_stat_t *c) { 2545 2539 … … 2548 2542 || !(c->magic == LIBTRACE_STAT_MAGIC)) { 2549 2543 fprintf(stderr, "Use trace_create_statistics() to allocate statistics in trace_subtract_statistics()\n"); 2550 return TRACE_ERR_STAT;2544 return; 2551 2545 } 2552 2546 … … 2567 2561 LIBTRACE_STAT_FIELDS 2568 2562 #undef X 2569 return 0; 2570 } 2571 2572 int trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2563 } 2564 2565 void trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2573 2566 libtrace_stat_t *c) { 2574 2567 if (!(a->magic == LIBTRACE_STAT_MAGIC) … … 2576 2569 || !(c->magic == LIBTRACE_STAT_MAGIC)) { 2577 2570 fprintf(stderr, "Use trace_create_statistics() to allocate statistics in trace_add_statistics()\n"); 2578 return TRACE_ERR_STAT;2571 return; 2579 2572 } 2580 2573 … … 2595 2588 LIBTRACE_STAT_FIELDS 2596 2589 #undef X 2597 return 0;2598 2590 } 2599 2591 -
lib/trace_parallel.c
r2ceec6a rf6f3ae5 272 272 { 273 273 /*assert(libtrace->state != STATE_NEW);*/ 274 if (!(libtrace->stat s!= STATE_NEW)) {274 if (!(libtrace->state != STATE_NEW)) { 275 275 trace_set_err(libtrace, TRACE_ERR_BAD_STATE, "Cannot check reporter for the current state in trace_has_reporter()"); 276 276 return false;
Note: See TracChangeset
for help on using the changeset viewer.