Changeset b5cd711 for lib/format_erf.c
- Timestamp:
- 08/26/05 11:22:23 (15 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:
- 53f8305
- Parents:
- 1974620
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
r1974620 rb5cd711 572 572 573 573 do { 574 if ( fifo_out_available(libtrace->fifo) == 0 || read_required) {574 if (tracefifo_out_available(libtrace->fifo) == 0 || read_required) { 575 575 if ((numbytes = rtclient_read( 576 576 libtrace,buf,RP_BUFSIZE))<=0) { 577 577 return numbytes; 578 578 } 579 fifo_write(libtrace->fifo,buf,numbytes);579 tracefifo_write(libtrace->fifo,buf,numbytes); 580 580 read_required = 0; 581 581 } 582 582 // Read status byte 583 if ( fifo_out_read(libtrace->fifo,583 if (tracefifo_out_read(libtrace->fifo, 584 584 &packet->status, sizeof(int)) == 0) { 585 585 read_required = 1; 586 586 continue; 587 587 } 588 fifo_out_update(libtrace->fifo,sizeof(int));588 tracefifo_out_update(libtrace->fifo,sizeof(int)); 589 589 590 590 // read in the ERF header 591 if ((numbytes = fifo_out_read(libtrace->fifo, buffer,591 if ((numbytes = tracefifo_out_read(libtrace->fifo, buffer, 592 592 sizeof(dag_record_t))) == 0) { 593 fifo_out_reset(libtrace->fifo);593 tracefifo_out_reset(libtrace->fifo); 594 594 read_required = 1; 595 595 continue; … … 598 598 599 599 // read in the full packet 600 if ((numbytes = fifo_out_read(libtrace->fifo,600 if ((numbytes = tracefifo_out_read(libtrace->fifo, 601 601 buffer, size)) == 0) { 602 fifo_out_reset(libtrace->fifo);602 tracefifo_out_reset(libtrace->fifo); 603 603 read_required = 1; 604 604 continue; … … 606 606 607 607 // got in our whole packet, so... 608 fifo_out_update(libtrace->fifo,size);609 610 fifo_ack_update(libtrace->fifo,size + sizeof(int));608 tracefifo_out_update(libtrace->fifo,size); 609 610 tracefifo_ack_update(libtrace->fifo,size + sizeof(int)); 611 611 612 612 packet->size = numbytes; … … 699 699 700 700 assert(libtrace->fifo); 701 if ( fifo_out_available(libtrace->fifo) == 0 || write_required) {701 if (tracefifo_out_available(libtrace->fifo) == 0 || write_required) { 702 702 // Packet added to fifo 703 if ((numbytes = fifo_write(libtrace->fifo, packet->buffer, packet->size)) == 0) {703 if ((numbytes = tracefifo_write(libtrace->fifo, packet->buffer, packet->size)) == 0) { 704 704 // some error with the fifo 705 perror(" fifo_write");705 perror("tracefifo_write"); 706 706 return -1; 707 707 } … … 710 710 711 711 // Read from fifo and add protocol header 712 if ((numbytes = fifo_out_read(libtrace->fifo, buffer, sizeof(dag_record_t))) == 0) {712 if ((numbytes = tracefifo_out_read(libtrace->fifo, buffer, sizeof(dag_record_t))) == 0) { 713 713 // failure reading in from fifo 714 fifo_out_reset(libtrace->fifo);714 tracefifo_out_reset(libtrace->fifo); 715 715 write_required = 1; 716 716 continue; … … 718 718 size = ntohs(((dag_record_t *)buffer)->rlen); 719 719 assert(size < LIBTRACE_PACKET_BUFSIZE); 720 if ((numbytes = fifo_out_read(libtrace->fifo, buffer, size)) == 0) {720 if ((numbytes = tracefifo_out_read(libtrace->fifo, buffer, size)) == 0) { 721 721 // failure reading in from fifo 722 fifo_out_reset(libtrace->fifo);722 tracefifo_out_reset(libtrace->fifo); 723 723 write_required = 1; 724 724 continue; … … 733 733 734 734 735 fifo_out_update(libtrace->fifo, size);736 fifo_ack_update(libtrace->fifo, size);735 tracefifo_out_update(libtrace->fifo, size); 736 tracefifo_ack_update(libtrace->fifo, size); 737 737 return numbytes; 738 738 } while(1);
Note: See TracChangeset
for help on using the changeset viewer.