Changeset 89cc0cc
- Timestamp:
- 11/22/18 17:10:50 (4 years ago)
- Branches:
- develop
- Children:
- 25a3255
- Parents:
- 33b735c
- Location:
- lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/libtrace.h.in
r33b735c r89cc0cc 324 324 /** Trace err stat **/ 325 325 TRACE_ERR_STAT = -20, 326 /** Unable to create deadtrace **/ 327 TRACE_ERR_CREATE_DEADTRACE = -21, 326 328 }; 327 329 … … 1544 1546 * 1545 1547 */ 1546 DLLEXPORT voidtrace_destroy(libtrace_t *trace);1548 DLLEXPORT int trace_destroy(libtrace_t *trace); 1547 1549 1548 1550 /** Close a dummy trace file, freeing up any resources it may have been using 1549 1551 * @param trace The dummy trace to be destroyed 1550 1552 */ 1551 DLLEXPORT voidtrace_destroy_dead(libtrace_t *trace);1553 DLLEXPORT int trace_destroy_dead(libtrace_t *trace); 1552 1554 1553 1555 /** Close an output trace, freeing up any resources it may have been using 1554 1556 * @param trace The output trace to be destroyed 1555 1557 */ 1556 DLLEXPORT voidtrace_destroy_output(libtrace_out_t *trace);1558 DLLEXPORT int trace_destroy_output(libtrace_out_t *trace); 1557 1559 1558 1560 /** Flush an output trace, forcing any buffered packets to be written … … 1708 1710 */ 1709 1711 DLLEXPORT 1710 voidtrace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,1712 int trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t, 1711 1713 libtrace_stat_t *stats); 1712 1714 … … 1742 1744 */ 1743 1745 DLLEXPORT 1744 voidtrace_subtract_statistics(const libtrace_stat_t *a,1746 int trace_subtract_statistics(const libtrace_stat_t *a, 1745 1747 const libtrace_stat_t *b, libtrace_stat_t *c); 1746 1748 … … 1754 1756 */ 1755 1757 DLLEXPORT 1756 voidtrace_add_statistics(const libtrace_stat_t *a,1758 int trace_add_statistics(const libtrace_stat_t *a, 1757 1759 const libtrace_stat_t *b, libtrace_stat_t *c); 1758 1760 … … 1942 1944 */ 1943 1945 DLLEXPORT 1944 voidtrace_construct_packet(libtrace_packet_t *packet,1946 int trace_construct_packet(libtrace_packet_t *packet, 1945 1947 libtrace_linktype_t linktype, const void *data, uint16_t len); 1946 1948 -
lib/trace.c
r33b735c r89cc0cc 731 731 * 732 732 */ 733 DLLEXPORT voidtrace_destroy(libtrace_t *libtrace) {733 DLLEXPORT int trace_destroy(libtrace_t *libtrace) { 734 734 int i; 735 735 736 assert(libtrace);737 //if(!libtrace) {738 //return TRACE_ERR_NULL_TRACE;739 //}736 /*assert(libtrace);*/ 737 if(!libtrace) { 738 return TRACE_ERR_NULL_TRACE; 739 } 740 740 741 741 ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0); … … 758 758 trace_fin_packet(libtrace->last_packet); 759 759 } 760 assert(libtrace->last_packet == NULL);761 //if (libtrace->last_packet != NULL) {762 //trace_set_err(libtrace, TRACE_ERR_PAUSE_FIN, "Unable to remove all data stored against trace in trace_destroy()");763 //return -1;764 //}760 /*assert(libtrace->last_packet == NULL);*/ 761 if (libtrace->last_packet != NULL) { 762 trace_set_err(libtrace, TRACE_ERR_PAUSE_FIN, "Unable to remove all data stored against trace in trace_destroy()"); 763 return -1; 764 } 765 765 766 766 if (libtrace->format) { … … 826 826 827 827 free(libtrace); 828 } 829 830 831 DLLEXPORT void trace_destroy_dead(libtrace_t *libtrace) { 832 assert(libtrace); 833 //if(!libtrace) { 834 // return TRACE_ERR_NULL_TRACE; 835 //} 828 829 return 0; 830 } 831 832 833 DLLEXPORT int trace_destroy_dead(libtrace_t *libtrace) { 834 /*assert(libtrace);*/ 835 if(!libtrace) { 836 return TRACE_ERR_NULL_TRACE; 837 } 836 838 837 839 ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0); … … 845 847 free(libtrace->format_data); 846 848 free(libtrace); 849 850 return 0; 847 851 } 848 852 /* 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 851 855 */ 852 DLLEXPORT voidtrace_destroy_output(libtrace_out_t *libtrace) {853 assert(libtrace);854 //if(!libtrace) {855 //return TRACE_ERR_NULL_TRACE;856 //}856 DLLEXPORT int trace_destroy_output(libtrace_out_t *libtrace) { 857 /*assert(libtrace);*/ 858 if(!libtrace) { 859 return TRACE_ERR_NULL_TRACE; 860 } 857 861 if (libtrace->format && libtrace->format->fin_output) 858 862 libtrace->format->fin_output(libtrace); … … 860 864 free(libtrace->uridata); 861 865 free(libtrace); 866 867 return 0; 862 868 } 863 869 … … 2221 2227 */ 2222 2228 DLLEXPORT 2223 voidtrace_construct_packet(libtrace_packet_t *packet,2229 int trace_construct_packet(libtrace_packet_t *packet, 2224 2230 libtrace_linktype_t linktype, 2225 2231 const void *data, 2226 uint16_t len) 2227 { 2232 uint16_t len) { 2233 2234 if (!packet) { 2235 return TRACE_ERR_NULL_PACKET; 2236 } 2237 2228 2238 size_t size; 2229 2239 static libtrace_t *deadtrace=NULL; … … 2255 2265 2256 2266 /* Now fill in the libtrace packet itself */ 2257 assert(deadtrace); 2267 /*assert(deadtrace);*/ 2268 if (!deadtrace) { 2269 return TRACE_ERR_CREATE_DEADTRACE; 2270 } 2258 2271 packet->trace=deadtrace; 2259 2272 size=len+sizeof(hdr); … … 2278 2291 2279 2292 trace_clear_cache(packet); 2293 2294 return 0; 2280 2295 } 2281 2296 … … 2428 2443 } 2429 2444 2430 voidtrace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t,2445 int trace_get_thread_statistics(libtrace_t *trace, libtrace_thread_t *t, 2431 2446 libtrace_stat_t *stat) 2432 2447 { 2433 assert(trace && stat); 2434 assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use" 2435 "trace_create_statistics() to allocate statistics"); 2448 /*assert(trace && stat);*/ 2449 if (!trace) { 2450 return TRACE_ERR_NULL_TRACE; 2451 } 2452 if (!stat) { 2453 trace_set_err(trace, TRACE_ERR_STAT, "Stat is NULL trace_get_thread_statistics()"); 2454 return -1; 2455 } 2456 /*assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use" 2457 "trace_create_statistics() to allocate statistics");*/ 2458 if (!(stat->magic == LIBTRACE_STAT_MAGIC)) { 2459 trace_set_err(trace, TRACE_ERR_STAT, 2460 "Use trace_create_statistics() to allocate statistics in trave_get_thread_statistics()"); 2461 return -1; 2462 } 2436 2463 stat->reserved1 = 0; 2437 2464 stat->reserved2 = 0; … … 2446 2473 trace->format->get_thread_statistics(trace, t, stat); 2447 2474 } 2448 return; 2475 2476 return 0; 2449 2477 } 2450 2478 … … 2464 2492 } 2465 2493 2466 voidtrace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,2494 int trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2467 2495 libtrace_stat_t *c) { 2468 assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use" 2496 2497 if (!(a->magic == LIBTRACE_STAT_MAGIC) 2498 || !(b->magic == LIBTRACE_STAT_MAGIC) 2499 || !(c->magic == LIBTRACE_STAT_MAGIC)) { 2500 return TRACE_ERR_STAT; 2501 } 2502 2503 /*assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use" 2469 2504 "trace_create_statistics() to allocate statistics"); 2470 2505 assert(b->magic == LIBTRACE_STAT_MAGIC && "Please use" 2471 2506 "trace_create_statistics() to allocate statistics"); 2472 2507 assert(c->magic == LIBTRACE_STAT_MAGIC && "Please use" 2473 "trace_create_statistics() to allocate statistics"); 2508 "trace_create_statistics() to allocate statistics");*/ 2474 2509 2475 2510 #define X(x) \ … … 2482 2517 LIBTRACE_STAT_FIELDS 2483 2518 #undef X 2484 } 2485 2486 void trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2519 return 0; 2520 } 2521 2522 int trace_add_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2487 2523 libtrace_stat_t *c) { 2488 assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use" 2524 if (!(a->magic == LIBTRACE_STAT_MAGIC) 2525 || !(b->magic == LIBTRACE_STAT_MAGIC) 2526 || !(c->magic == LIBTRACE_STAT_MAGIC)) { 2527 return TRACE_ERR_STAT; 2528 } 2529 2530 /*assert(a->magic == LIBTRACE_STAT_MAGIC && "Please use" 2489 2531 "trace_create_statistics() to allocate statistics"); 2490 2532 assert(b->magic == LIBTRACE_STAT_MAGIC && "Please use" 2491 2533 "trace_create_statistics() to allocate statistics"); 2492 2534 assert(c->magic == LIBTRACE_STAT_MAGIC && "Please use" 2493 "trace_create_statistics() to allocate statistics"); 2535 "trace_create_statistics() to allocate statistics");*/ 2494 2536 2495 2537 #define X(x) \ … … 2502 2544 LIBTRACE_STAT_FIELDS 2503 2545 #undef X 2546 return 0; 2504 2547 } 2505 2548
Note: See TracChangeset
for help on using the changeset viewer.