Changeset 4658

Show
Ignore:
Timestamp:
03/01/10 20:52:46 (4 years ago)
Author:
soohyunc
Message:

-- added <stdlib.h> for the use of abort() function.
-- missed to place set_rtx_timer() every time send a packet
-- added option if TFWC is driven by timer-out mechanism

(this timer-driven mechanism has not been fully implemented yet)

Location:
vic/branches/cc/cc
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/cc/cc/cc_timer.cpp

    r4657 r4658  
    3333 
    3434#include <assert.h> 
     35#include <stdlib.h> 
    3536#include "cc_timer.h" 
    3637 
  • vic/branches/cc/cc/tfwc_sndr.cpp

    r4657 r4658  
    118118        I_tot1_ = 0.0; 
    119119        tot_weight_ = 0.0; 
     120 
     121        timer_driven_ = false; 
    120122} 
    121123 
     
    137139        // number of total data packet sent 
    138140        //ndtp_++; 
     141         
     142        // set retransmission timer 
     143        set_rtx_timer(); 
    139144} 
    140145 
     
    581586 */ 
    582587void TfwcSndr::expire(int option) { 
    583         if (option == TFWC_TIMER_RTX) 
     588        if (option == TFWC_TIMER_RTX) { 
     589                if(!timer_driven_) 
    584590                reset_rtx_timer(1); 
    585         else 
     591                else 
    586592                reset_rtx_timer(0); 
     593 
     594                // TBA - need to add send method here 
     595        } 
    587596} 
    588597 
  • vic/branches/cc/cc/tfwc_sndr.h

    r4657 r4658  
    283283        double tot_weight_;     // total weight 
    284284        int hsz_;               // current history size 
     285        bool timer_driven_;     // is TFWC being driven by timer-out? 
    285286 
    286287        // RTT related variables