Changeset - 05f0e3e28a7e
[Not reviewed]
default
0 2 0
Ethan Zonca (ethanzonca) - 15 years ago 2010-06-07 18:18:29
e@ethanzonca.com
Fixed build errors caused by misspell
2 files changed with 24 insertions and 22 deletions:
0 comments (0 inline, 0 general)
src/server/slavefuncs.c
Show inline comments
 
@@ -876,13 +876,13 @@ free(realOutput);
 
   Currently, most functions are stubs due to lack
 
   of socket reading code */
 

	
 
void finishframe(struct remotio *rem, int jobnum, int framenum){
 
void finishframe(struct remoteio *rem, int jobnum, int framenum){
 
  char* data;
 
  _distren_asprintf(&data, "%d%d", jobnum, framenum);
 
  sendExtSignal(rem, DISTREN_REQUEST_DONEFRAME, data);
 
}
 

	
 
void resetframe(struct remotio *rem, int jobnum, int framenum){
 
void resetframe(struct remoteio *rem, int jobnum, int framenum){
 
  fprintf(stderr,"Resetting frame %d in job %d on server... ",framenum,jobnum);
 
  char* data;
 
  _distren_asprintf(&data, "%d%d", jobnum, framenum);
 
@@ -890,7 +890,7 @@ void resetframe(struct remotio *rem, int
 

	
 
}
 

	
 
void startframe(struct remotio *rem, int jobnum, int framenum){
 
void startframe(struct remoteio *rem, int jobnum, int framenum){
 
  if(DEBUG)
 
    fprintf(stderr,"Marking frame %d started on server... ",framenum);
 
  char* data;
 
@@ -899,30 +899,30 @@ void startframe(struct remotio *rem, int
 

	
 
}
 

	
 
int getwork(struct remotio *rem, int *jobnum, int *framenum){
 
int getwork(struct remoteio *rem, int *jobnum, int *framenum){
 
  char* data;
 
  _distren_asprintf(&data, "%d%d", jobnum, framenum);
 
  sendExtSignal(rem, DISTREN_REQUEST_GETWORK, data)
 
  sendExtSignal(rem, DISTREN_REQUEST_GETWORK, data);
 
  return 0;
 
}
 

	
 
void setrenderpower(struct remotio *rem, int renderpower){
 
void setrenderpower(struct remoteio *rem, int renderpower){
 
  fprintf(stderr,"Setting render power on server... ");
 
  char* data;
 
  _distren_asprintf(&data, "%d", renderpower);
 
  sendExtSignal(rem, DISTREN_REQEST_SETRENDERPOWER, data);
 
  sendExtSignal(rem,DISTREN_REQUEST_SETRENDERPOWER, data);
 
}
 

	
 

	
 
int getrenderpower(struct remotio *rem){
 
int getrenderpower(struct remoteio *rem){
 
  sendSignal(rem, DISTREN_REQUEST_GETRENDERPOWER);
 
  return 0;
 
}
 

	
 
int checkslaveversion(struct remotio *rem){
 
int checkslaveversion(struct remoteio *rem){
 
  sendSignal(rem, DISTREN_REQUEST_GETVERSION);
 
  int server_version = 9000;
 

	
 
  if(PACKAGE_VERSION != server_version)
 
  char* serverVersionFromRemotio = "9000";
 
  if(!strcmp(PACKAGE_VERSION, serverVersionFromRemotio)) // compare versions
 
    return 1;
 
  else
 
    return 0;
 
  return 0;
 
}
src/server/slavefuncs.h
Show inline comments
 
@@ -54,6 +54,15 @@ void prepareJobPaths(int jobnum, int fra
 
int checkUsername(char *username);
 
void slaveTest();
 

	
 
/* Standard slave */
 
void finishframe(struct remoteio *rem, int jobnum, int framenum);
 
void resetframe(struct remoteio *rem, int jobnum, int framenum);
 
void startframe(struct remoteio *rem, int jobnum, int framenum);
 
int getwork(struct remoteio *rem, int *jobnum, int *framenum);
 
void setrenderpower(struct remoteio *rem, int renderpower);
 
int getrenderpower(struct remoteio *rem);
 
int checkslaveversion(struct remoteio *rem);
 

	
 
/* Simple slave */
 
struct _web_memorystruct;
 
void *_web_myrealloc(void *ptr, size_t size);
 
@@ -66,13 +75,6 @@ int _web_getwork(int slavekey, char *sla
 
void _web_setrenderpower(int slavekey, char *slavepass, int renderpower);
 
int slaveBenchmark(char *datadir, int *benchmarkTime, int *renderPower);
 

	
 
/* Standard slave */
 
void finishframe(struct remotio *rem, int jobnum, int framenum);
 
void resetframe(struct remotio *rem, int jobnum, int framenum);
 
void startframe(struct remotio *rem, int jobnum, int framenum);
 
int getwork(struct remotio *rem, int *jobnum, int *framenum);
 
void setrenderpower(struct remotio *rem, int renderpower);
 
int getrenderpower(struct remotio *rem);
 
int checkslaveversion(struct remotio *rem);
 

	
 

	
 
#endif
0 comments (0 inline, 0 general)