Revision e3f73a68

View differences:

measures-monl.c
249 249
	int j = 0;
250 250
	enum stat_types stwinavgwinvar[] = {WIN_AVG, WIN_VAR};
251 251
	enum stat_types stwinavg[] = {WIN_AVG};
252
	enum stat_types stwinavgrate[] = {WIN_AVG, RATE};
252
//      enum stat_types stwinavgrate[] = {WIN_AVG, RATE};
253 253
//	enum stat_types stsum[] = {SUM};
254 254
	enum stat_types stsumwinsumrate[] = {SUM, PERIOD_SUM, WIN_SUM, RATE};
255 255

  
streaming.c
151 151
  struct chunk_attributes * ca;
152 152

  
153 153
  if (!c->attributes || c->attributes_size != sizeof(struct chunk_attributes)) {
154
    fprintf(stderr,"Warning, chunk %d with strange attributes block. Size:%d expected:%lu\n", c->id, c->attributes ? c->attributes_size : 0, sizeof(struct chunk_attributes));
154
    fprintf(stderr,"Warning, chunk %d with strange attributes block. Size:%d expected:%u\n", c->id, c->attributes ? c->attributes_size : 0, sizeof(struct chunk_attributes));
155 155
    return -1;
156 156
  }
157 157

  
......
164 164
  struct chunk_attributes * ca;
165 165

  
166 166
  if (!c->attributes || c->attributes_size != sizeof(struct chunk_attributes)) {
167
    fprintf(stderr,"Warning, received chunk %d with strange attributes block. Size:%d expected:%lu\n", c->id, c->attributes ? c->attributes_size : 0, sizeof(struct chunk_attributes));
167
    fprintf(stderr,"Warning, received chunk %d with strange attributes block. Size:%d expected:%u\n", c->id, c->attributes ? c->attributes_size : 0, sizeof(struct chunk_attributes));
168 168
    return;
169 169
  }
170 170

  
......
599 599

  
600 600
    for (i = 0;i < size; i++) chunkids[size - 1 - i] = (buff+i)->id;
601 601
    for (i = 0; i<n; i++) nodeids[i] = (neighbours+i);
602
    selectPeersForChunks(SCHED_WEIGHTING, nodeids, n, chunkids, size, selectedpeers, &selectedpeers_len, SCHED_NEEDS, SCHED_PEER);
602
    schedSelectPeersForChunks(SCHED_WEIGHTING, nodeids, n, chunkids, size, selectedpeers, &selectedpeers_len, SCHED_NEEDS, SCHED_PEER);
603 603

  
604 604
    for (i=0; i<selectedpeers_len ; i++){
605 605
      int transid = transaction_create(selectedpeers[i]->id);
......
648 648

  
649 649
    for (i=0; i<selectedpairs_len ; i++){
650 650
      struct peer *p = selectedpairs[i].peer;
651
      struct chunk *c = cb_get_chunk(cb, selectedpairs[i].chunk);
651
      const struct chunk *c = cb_get_chunk(cb, selectedpairs[i].chunk);
652 652
      dprintf("\t sending chunk[%d] to ", c->id);
653 653
      dprintf("%s\n", node_addr(p->id));
654 654

  

Also available in: Unified diff