Changeset 9215

Show
Ignore:
Timestamp:
08/09/08 11:28:00
Author:
jcorgan
Message:

cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • usrp2/trunk/host-ng/apps/rx_streaming_samples.cc

    r9214 r9215  
    6262class rx_nop_handler : public usrp2::rx_sample_handler 
    6363{ 
    64   size_t      d_max_samples; 
    65   size_t      d_nsamples; 
    66   size_t      d_nframes; 
     64  uint64_t    d_max_samples; 
     65  uint64_t    d_nsamples; 
     66  uint64_t    d_nframes; 
    6767 
    6868protected: 
    …… 
    7171public: 
    7272   
    73   rx_nop_handler(size_t max_samples) 
     73  rx_nop_handler(uint64_t max_samples) 
    7474    : d_max_samples(max_samples), d_nsamples(0), d_nframes(0), d_err(false) {} 
    7575       
    7676  ~rx_nop_handler(); 
    7777 
    78   size_t nframes() const { return d_nframes; } 
    79   size_t nsamples() const { return d_nsamples; } 
    80   size_t max_samples() const { return d_max_samples; } 
    81   bool   has_errored_p() const { return d_err; } 
    82   bool   has_finished_p() const  
     78  uint64_t nframes() const { return d_nframes; } 
     79  uint64_t nsamples() const { return d_nsamples; } 
     80  uint64_t max_samples() const { return d_max_samples; } 
     81  bool has_errored_p() const { return d_err; } 
     82  bool has_finished_p() const  
    8383    { return d_max_samples == 0 ? false : d_nsamples >= d_max_samples; } 
    8484     
    …… 
    101101} 
    102102 
     103typedef boost::shared_ptr<rx_nop_handler> handler_sptr; 
     104 
    103105// ------------------------------------------------------------------------ 
    104106 
    …… 
    112114public: 
    113115 
    114   complex_16_file_writer(const std::string &filename, size_t max_samples) 
     116  complex_16_file_writer(const std::string &filename, uint64_t max_samples) 
    115117    : rx_nop_handler(max_samples), d_filename(filename) 
    116118  { 
    …… 
    164166public: 
    165167 
    166   complex_float_file_writer(const std::string &filename, size_t max_samples) 
     168  complex_float_file_writer(const std::string &filename, uint64_t max_samples) 
    167169    : rx_nop_handler(max_samples), d_filename(filename) 
    168170  { 
    …… 
    245247  int rx_decim = 5; 
    246248  double rx_gain = 0.0; 
    247   size_t nsamples = 0; 
     249  uint64_t nsamples = 0; 
    248250  bool output_shorts = false; 
    249251  char *output_filename = 0; 
    …… 
    290292 
    291293    case 'N': 
    292       printf("In 'N' clause: optarg=%p &tmp=%p\n", optarg, &tmp); 
    293294      if (!strtod_si(optarg, &tmp)) { 
    294295        std::cerr << "invalid number: " << optarg << std::endl; 
    …… 
    296297        exit(1); 
    297298      } 
    298       nsamples = static_cast<size_t>(tmp); 
     299      nsamples = static_cast<uint64_t>(tmp); 
    299300      break; 
    300301       
    301 #if 0 
    302     case 'b': 
    303       if (!strtod_si(optarg, &tmp)) { 
    304         std::cerr << "invalid number: " << optarg << std::endl; 
    305         usage(argv[0]); 
    306         exit(1); 
    307       } 
    308       bufsize = static_cast<size_t>(tmp); 
    309       break; 
    310 #endif 
    311  
    312302    case 's': 
    313303      output_shorts = true; 
    …… 
    332322  install_sig_handler(SIGINT, sig_handler); 
    333323 
    334  
    335   typedef boost::shared_ptr<rx_nop_handler> handler_sptr; 
    336324  handler_sptr handler; 
    337325 
    …… 
    418406 
    419407  if (verbose){ 
    420     printf("\nCopy handler called %zd times.\n", handler->nframes()); 
    421     printf("Copy handler called with %zd bytes.\n\n", handler->nsamples()*sizeof(uint32_t)); 
     408    printf("\nCopy handler called %li times.\n", handler->nframes()); 
     409    printf("Copy handler called with %li bytes.\n\n", handler->nsamples()*sizeof(uint32_t)); 
    422410    printf("Elapsed time was %5.3f seconds.\n", elapsed); 
    423411    printf("Packet rate was %1.0f pkts/sec.\n", pps);