ia64/xen-unstable

changeset 4250:c378c32a9538

bitkeeper revision 1.1236.1.104 (423f3d6fogKK-3Ekb9tjwtdIycRzfw)

little fix to remote read path

Signed-off-by: andrew.warfield.cl.cam.ac.uk
author akw27@arcadians.cl.cam.ac.uk
date Mon Mar 21 21:32:31 2005 +0000 (2005-03-21)
parents 07d81708cc40
children 486217f3ad4f
files tools/blktap/blockstore.c
line diff
     1.1 --- a/tools/blktap/blockstore.c	Mon Mar 21 20:07:51 2005 +0000
     1.2 +++ b/tools/blktap/blockstore.c	Mon Mar 21 21:32:31 2005 +0000
     1.3 @@ -14,6 +14,8 @@
     1.4  #include <sys/types.h>
     1.5  #include <sys/stat.h>
     1.6  #include "blockstore.h"
     1.7 +#include "parallax-threaded.h"
     1.8 +
     1.9  #define BLOCKSTORE_REMOTE
    1.10  
    1.11  #ifdef BLOCKSTORE_REMOTE
    1.12 @@ -156,10 +158,13 @@ void *readblock_indiv(int server, u64 id
    1.13          fprintf(stderr, "readblock recv short (%u)\n", len);
    1.14          goto err;
    1.15      }
    1.16 +    /* akw: memory leak here? */
    1.17 +    /*
    1.18      if ((block = malloc(BLOCK_SIZE)) == NULL) {
    1.19          perror("readblock malloc");
    1.20          goto err;
    1.21      }
    1.22 +    */
    1.23      //memcpy(block, qe->message.block, BLOCK_SIZE);
    1.24      block = qe->block;
    1.25  
    1.26 @@ -416,7 +421,6 @@ u64 allocblock_hint(void *block, u64 hin
    1.27  
    1.28  #else /* /BLOCKSTORE_REMOTE */
    1.29  
    1.30 -#include "parallax-threaded.h"
    1.31   
    1.32  /**
    1.33   * readblock: read a block from disk
    1.34 @@ -688,8 +692,7 @@ int __init_blockstore(void)
    1.35      
    1.36  #ifdef BLOCKSTORE_REMOTE
    1.37      struct hostent *addr;
    1.38 -    int i;
    1.39 -
    1.40 +/* james's list
    1.41      bsservers[0].hostname = "firebug.cl.cam.ac.uk";
    1.42      bsservers[1].hostname = "tetris.cl.cam.ac.uk";
    1.43      bsservers[2].hostname = "donkeykong.cl.cam.ac.uk";
    1.44 @@ -698,6 +701,15 @@ int __init_blockstore(void)
    1.45      bsservers[5].hostname = "firetrack.cl.cam.ac.uk";
    1.46      bsservers[6].hostname = "funfair.cl.cam.ac.uk";
    1.47      bsservers[7].hostname = "felix.cl.cam.ac.uk";
    1.48 +*/
    1.49 +    bsservers[0].hostname = "arcadians.cl.cam.ac.uk";
    1.50 +    bsservers[1].hostname = "uridium.cl.cam.ac.uk";
    1.51 +    bsservers[2].hostname = "shep.cl.cam.ac.uk";
    1.52 +    bsservers[3].hostname = "centipede.cl.cam.ac.uk";
    1.53 +    bsservers[4].hostname = "ghouls.cl.cam.ac.uk";
    1.54 +    bsservers[5].hostname = "phoenix.cl.cam.ac.uk";
    1.55 +    bsservers[6].hostname = "swarm.cl.cam.ac.uk";
    1.56 +    bsservers[7].hostname = "freefall.cl.cam.ac.uk";
    1.57      bsservers[8].hostname = NULL;
    1.58      bsservers[9].hostname = NULL;
    1.59      bsservers[10].hostname = NULL;