Changeset - 195048ceb561
[Not reviewed]
default
0 2 0
Ethan Zonca (ethanzonca) - 16 years ago 2010-03-17 23:54:12
e@ethanzonca.com
Added version checking, asks before running benchmark.
2 files changed with 24 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/server/simpleslave.c
Show inline comments
 
@@ -130,6 +130,11 @@ int main(int argc, char *argv[])
 

	
 
  int benchmarkTime = 0;
 
  int renderPower = 0;
 

	
 
  char option[1] = "";
 
  fprintf(stderr,"Do you want to recalculate render power? (y/n): ");
 
  scanf("%s", option);
 
  if(!strcmp(option, "y")){
 
  if(slaveBenchmark(datadir, &benchmarkTime, &renderPower)){
 
    fprintf(stderr,"Benchmark failed! Exiting.\n");
 
    return 1;
 
@@ -138,6 +143,7 @@ int main(int argc, char *argv[])
 
    fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n", benchmarkTime, renderPower);
 
    _web_setrenderpower(slavekey, password, renderPower);
 
  }
 
  }
 

	
 
  // Main loop
 
  while(!quit)
src/server/slavefuncs.c
Show inline comments
 
@@ -733,12 +733,28 @@ int _web_getwork(int slavekey, char *sla
 
    free(data.memory);
 
    return 0;
 
  }
 
  // Compare to PACKAGE_VERSIOn
 
  else{
 
    *jobnum = atoi(data.memory);
 
    *framenum = atoi(strchr(data.memory, ',') + 1);
 
    char *tmp;
 
    int serverversion = 0;
 
    int packageversion = *PACKAGE_VERSION;
 
    tmp = strtok (data.memory,",");
 
    if(tmp != NULL){ // make sure work is available
 
      *jobnum = atoi(tmp);
 
      tmp = strtok (NULL, ",");
 
      *framenum = atoi(tmp);
 
      tmp = strtok (NULL, ",");
 
      serverversion = atoi(tmp);
 
      if(packageversion < serverversion){
 
        fprintf(stderr,"Your distren package is out of date! Please acquire a newer version.\n");
 
        return 0;
 
      }
 
    free(data.memory);
 
    return 1;
 
  }
 
    else
 
      return 0; // error
 
  }
 
}
 

	
 
void _web_setrenderpower(int slavekey, char *slavepass, int renderpower){
0 comments (0 inline, 0 general)